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

Commit d2129964 authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Android (Google) Code Review
Browse files

Merge "Fix MediaPlayer construction with AUDIO_SESSION_ALLOCATE."

parents ad305902 1e54119f

media/libmedia/include/media/mediaplayer.h

+2 −1
Original line number Diff line number Diff line
@@ -214,7 +214,8 @@ class MediaPlayer : public BnMediaPlayerClient, 
{

public:

    explicit MediaPlayer(const android::content::AttributionSourceState& mAttributionSource =

        android::content::AttributionSourceState());

        android::content::AttributionSourceState(),

        audio_session_t sessionId = AUDIO_SESSION_ALLOCATE);

    ~MediaPlayer();

            void            died();

            void            disconnect();

media/libmedia/mediaplayer.cpp

+8 −3
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ namespace android { 
using media::VolumeShaper;

using content::AttributionSourceState;



MediaPlayer::MediaPlayer(const AttributionSourceState& attributionSource)

        : mAttributionSource(attributionSource)

MediaPlayer::MediaPlayer(const AttributionSourceState& attributionSource,

    const audio_session_t sessionId) : mAttributionSource(attributionSource)

{

    ALOGV("constructor");

    mListener = NULL;
@@ -61,7 +61,12 @@ MediaPlayer::MediaPlayer(const AttributionSourceState& attributionSource) 
    mLeftVolume = mRightVolume = 1.0;

    mVideoWidth = mVideoHeight = 0;

    mLockThreadId = 0;

    mAudioSessionId = (audio_session_t) AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION);

    if (sessionId == AUDIO_SESSION_ALLOCATE) {

        mAudioSessionId = static_cast<audio_session_t>(

            AudioSystem::newAudioUniqueId(AUDIO_UNIQUE_ID_USE_SESSION));

    } else {

        mAudioSessionId = sessionId;

    }

    AudioSystem::acquireAudioSessionId(mAudioSessionId, (pid_t)-1, (uid_t)-1); // always in client.

    mSendLevel = 0;

    mRetransmitEndpointValid = false;