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

Commit 25521834 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "PlayerBase: add audio session ID" into sc-dev

parents 578a36a1 41931254

media/libaaudio/src/core/AudioStream.cpp

+2 −1
Original line number Diff line number Diff line
@@ -591,7 +591,8 @@ void AudioStream::MyPlayerBase::registerWithAudioManager(const android::sp<Audio 
    std::lock_guard<std::mutex> lock(mParentLock);

    mParent = parent;

    if (!mRegistered) {

        init(android::PLAYER_TYPE_AAUDIO, AAudioConvert_usageToInternal(parent->getUsage()));

        init(android::PLAYER_TYPE_AAUDIO, AAudioConvert_usageToInternal(parent->getUsage()),

            (audio_session_t)parent->getSessionId());

        mRegistered = true;

    }

}

media/libaudioclient/PlayerBase.cpp

+3 −2
Original line number Diff line number Diff line
@@ -49,11 +49,12 @@ PlayerBase::~PlayerBase() { 
    baseDestroy();

}



void PlayerBase::init(player_type_t playerType, audio_usage_t usage) {

void PlayerBase::init(player_type_t playerType, audio_usage_t usage, audio_session_t sessionId) {

    if (mAudioManager == 0) {

                ALOGE("AudioPlayer realize: no audio service, player will not be registered");

    } else {

        mPIId = mAudioManager->trackPlayer(playerType, usage, AUDIO_CONTENT_TYPE_UNKNOWN, this);

        mPIId = mAudioManager->trackPlayer(playerType, usage, AUDIO_CONTENT_TYPE_UNKNOWN, this,

                sessionId);

    }

}

media/libaudioclient/TrackPlayerBase.cpp

+3 −2
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ TrackPlayerBase::~TrackPlayerBase() { 
    doDestroy();

}



void TrackPlayerBase::init(AudioTrack* pat, player_type_t playerType, audio_usage_t usage) {

    PlayerBase::init(playerType, usage);

void TrackPlayerBase::init(AudioTrack* pat, player_type_t playerType, audio_usage_t usage,

        audio_session_t sessionId) {

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

    mAudioTrack = pat;

    if (mAudioTrack != 0) {

        mSelfAudioDeviceCallback = new SelfAudioDeviceCallback(*this);

media/libaudioclient/include/media/PlayerBase.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public: 


protected:



            void init(player_type_t playerType, audio_usage_t usage);

            void init(player_type_t playerType, audio_usage_t usage, audio_session_t sessionId);

            void baseDestroy();



    //IPlayer methods handlers for derived classes

media/libaudioclient/include/media/TrackPlayerBase.h

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ public: 
    explicit TrackPlayerBase();

    virtual ~TrackPlayerBase();



            void init(AudioTrack* pat, player_type_t playerType, audio_usage_t usage);

            void init(AudioTrack* pat, player_type_t playerType, audio_usage_t usage,

                    audio_session_t sessionId);

    virtual void destroy();



    //IPlayer implementation