Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae495344 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge changes from topic "tpb_race_fix" into main am: 21883171 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2909337



Change-Id: I8a5b970a65d1cc40f995f8b035afc5dc05c9824f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80a2f81c 21883171

media/libaudioclient/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ cc_library { 
        "framework-permission-aidl-cpp",

        "libbinder",

        "libmediametrics",

        "libmediautils",

        "spatializer-aidl-cpp",

    ],

media/libaudioclient/TrackPlayerBase.cpp

+22 −20
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ void TrackPlayerBase::init(const sp<AudioTrack>& pat, 
                           player_type_t playerType, audio_usage_t usage,

                           audio_session_t sessionId) {

    PlayerBase::init(playerType, usage, sessionId);

    mAudioTrack = pat;

    if (mAudioTrack != 0) {

    mAudioTrack.store(pat);

    if (pat != 0) {

        mCallbackHandle = callback;

        mSelfAudioDeviceCallback = new SelfAudioDeviceCallback(*this);

        mAudioTrack->addAudioDeviceCallback(mSelfAudioDeviceCallback);

        mAudioTrack->setPlayerIId(mPIId); // set in PlayerBase::init().

        pat->addAudioDeviceCallback(mSelfAudioDeviceCallback);

        pat->setPlayerIId(mPIId);  // set in PlayerBase::init().

    }

}
@@ -65,12 +65,15 @@ void TrackPlayerBase::SelfAudioDeviceCallback::onAudioDeviceUpdate(audio_io_hand 
}



void TrackPlayerBase::doDestroy() {

    if (mAudioTrack != 0) {

        mAudioTrack->stop();

        mAudioTrack->removeAudioDeviceCallback(mSelfAudioDeviceCallback);

        mSelfAudioDeviceCallback.clear();

    sp<AudioTrack> audioTrack = getAudioTrack();



    // Note that there may still be another reference in post-unlock phase of SetPlayState

        mAudioTrack.clear();

    clearAudioTrack();



    if (audioTrack != 0) {

        audioTrack->stop();

        audioTrack->removeAudioDeviceCallback(mSelfAudioDeviceCallback);

        mSelfAudioDeviceCallback.clear();

    }

}
@@ -87,16 +90,16 @@ void TrackPlayerBase::setPlayerVolume(float vl, float vr) { 
// Implementation of IPlayer

status_t TrackPlayerBase::playerStart() {

    status_t status = NO_INIT;

    if (mAudioTrack != 0) {

        status = mAudioTrack->start();

    if (sp<AudioTrack> audioTrack = getAudioTrack(); audioTrack != 0) {

        status = audioTrack->start();

    }

    return status;

}



status_t TrackPlayerBase::playerPause() {

    status_t status = NO_INIT;

    if (mAudioTrack != 0) {

        mAudioTrack->pause();

    if (sp<AudioTrack> audioTrack = getAudioTrack(); audioTrack != 0) {

        audioTrack->pause();

        status = NO_ERROR;

    }

    return status;
@@ -105,8 +108,8 @@ status_t TrackPlayerBase::playerPause() { 


status_t TrackPlayerBase::playerStop() {

    status_t status = NO_INIT;

    if (mAudioTrack != 0) {

        mAudioTrack->stop();

    if (sp<AudioTrack> audioTrack = getAudioTrack(); audioTrack != 0) {

        audioTrack->stop();

        status = NO_ERROR;

    }

    return status;
@@ -118,10 +121,10 @@ status_t TrackPlayerBase::playerSetVolume() { 


status_t TrackPlayerBase::doSetVolume() {

    status_t status = NO_INIT;

    if (mAudioTrack != 0) {

    if (sp<AudioTrack> audioTrack = getAudioTrack(); audioTrack != 0) {

        float tl = mPlayerVolumeL * mPanMultiplierL * mVolumeMultiplierL;

        float tr = mPlayerVolumeR * mPanMultiplierR * mVolumeMultiplierR;

        mAudioTrack->setVolume(tl, tr);

        audioTrack->setVolume(tl, tr);

        status = NO_ERROR;

    }

    return status;
@@ -140,10 +143,9 @@ binder::Status TrackPlayerBase::applyVolumeShaper( 
    if (s != OK) {

        return binderStatusFromStatusT(s);

    }



    if (mAudioTrack != 0) {

    if (sp<AudioTrack> audioTrack = getAudioTrack(); audioTrack != 0) {

        ALOGD("TrackPlayerBase::applyVolumeShaper() from IPlayer");

        VolumeShaper::Status status = mAudioTrack->applyVolumeShaper(spConfiguration, spOperation);

        VolumeShaper::Status status = audioTrack->applyVolumeShaper(spConfiguration, spOperation);

        if (status < 0) { // a non-negative value is the volume shaper id.

            ALOGE("TrackPlayerBase::applyVolumeShaper() failed with status %d", status);

        }

media/libaudioclient/include/media/TrackPlayerBase.h

+6 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <media/AudioTrack.h>

#include <media/PlayerBase.h>

#include <mediautils/Synchronization.h>



namespace android {
@@ -37,8 +38,9 @@ public: 
            const media::VolumeShaperConfiguration& configuration,

            const media::VolumeShaperOperation& operation);



    //FIXME move to protected field, so far made public to minimize changes to AudioTrack logic

    sp<AudioTrack> mAudioTrack;

    sp<AudioTrack> getAudioTrack() { return mAudioTrack.load(); }



    void clearAudioTrack() { mAudioTrack.store(nullptr); }



    void setPlayerVolume(float vl, float vr);
@@ -68,6 +70,7 @@ private: 
    float mPlayerVolumeL, mPlayerVolumeR;

    sp<AudioTrack::IAudioTrackCallback> mCallbackHandle;

    sp<SelfAudioDeviceCallback> mSelfAudioDeviceCallback;

    mediautils::atomic_sp<AudioTrack> mAudioTrack;

};



} // namespace android

media/libaudioclient/tests/trackplayerbase_tests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class TrackPlayerBaseTest 
        mPlayer = new TrackPlayer();

        mPlayer->init(track.get(), mPlayer, PLAYER_TYPE_AAUDIO, AUDIO_USAGE_MEDIA,

                      AUDIO_SESSION_NONE);

        sp<AudioTrack> playerTrack = mPlayer->mAudioTrack;

        sp<AudioTrack> playerTrack = mPlayer->getAudioTrack();

        ASSERT_EQ(playerTrack->initCheck(), NO_ERROR);



        mBufferSize = mFrameCount * playerTrack->frameSize();
@@ -74,7 +74,7 @@ class TrackPlayerBaseTest 


    void playBuffer() {

        bool blocking = true;

        ssize_t nbytes = mPlayer->mAudioTrack->write(mBuffer.data(), mBufferSize, blocking);

        ssize_t nbytes = mPlayer->getAudioTrack()->write(mBuffer.data(), mBufferSize, blocking);

        EXPECT_EQ(nbytes, mBufferSize) << "Did not write all data in blocking mode";

    }