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

Commit bd1be2da authored by Dichen Zhang's avatar Dichen Zhang Committed by Android (Google) Code Review
Browse files

Merge "setVolume() function using single input Test: run CTS"

parents bc4773d1 7398ca0f

media/libmediaplayer2/MediaPlayer2AudioOutput.cpp

+9 −11
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ status_t MediaPlayer2AudioOutput::dump(int fd, const Vector<String16>& args) con 
    String8 result;



    result.append(" MediaPlayer2AudioOutput\n");

    snprintf(buffer, 255, "  stream type(%d), left - right volume(%f, %f)\n",

            mStreamType, mLeftVolume, mRightVolume);

    snprintf(buffer, 255, "  stream type(%d), volume(%f)\n",

            mStreamType, mVolume);

    result.append(buffer);

    snprintf(buffer, 255, "  msec per frame(%f), latency (%d)\n",

            mMsecsPerFrame, (mTrack != 0) ? mTrack->latency() : -1);
@@ -67,8 +67,7 @@ MediaPlayer2AudioOutput::MediaPlayer2AudioOutput(audio_session_t sessionId, uid_ 
      mCallbackCookie(NULL),

      mCallbackData(NULL),

      mStreamType(AUDIO_STREAM_MUSIC),

      mLeftVolume(1.0),

      mRightVolume(1.0),

      mVolume(1.0),

      mPlaybackRate(AUDIO_PLAYBACK_RATE_DEFAULT),

      mSampleRateHz(0),

      mMsecsPerFrame(0),
@@ -402,7 +401,7 @@ status_t MediaPlayer2AudioOutput::open( 


    mCallbackData = newcbd;

    ALOGV("setVolume");

    t->setVolume(mLeftVolume, mRightVolume);

    t->setVolume(mVolume);



    mSampleRateHz = sampleRate;

    mFlags = flags;
@@ -444,7 +443,7 @@ status_t MediaPlayer2AudioOutput::start() { 
        mCallbackData->endTrackSwitch();

    }

    if (mTrack != 0) {

        mTrack->setVolume(mLeftVolume, mRightVolume);

        mTrack->setVolume(mVolume);

        mTrack->setAuxEffectSendLevel(mSendLevel);

        status_t status = mTrack->start();

        return status;
@@ -498,13 +497,12 @@ void MediaPlayer2AudioOutput::close() { 
    // destruction of the track occurs outside of mutex.

}



void MediaPlayer2AudioOutput::setVolume(float left, float right) {

    ALOGV("setVolume(%f, %f)", left, right);

void MediaPlayer2AudioOutput::setVolume(float volume) {

    ALOGV("setVolume(%f)", volume);

    Mutex::Autolock lock(mLock);

    mLeftVolume = left;

    mRightVolume = right;

    mVolume = volume;

    if (mTrack != 0) {

        mTrack->setVolume(left, right);

        mTrack->setVolume(volume);

    }

}

media/libmediaplayer2/include/mediaplayer2/MediaPlayer2AudioOutput.h

+2 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public: 
    }

    void setAudioAttributes(const audio_attributes_t * attributes);



    void setVolume(float left, float right);

    void setVolume(float volume);

    virtual status_t setPlaybackRate(const AudioPlaybackRate& rate);

    virtual status_t getPlaybackRate(AudioPlaybackRate* rate /* nonnull */);
@@ -113,8 +113,7 @@ private: 
    CallbackData *          mCallbackData;

    audio_stream_type_t     mStreamType;

    audio_attributes_t *    mAttributes;

    float                   mLeftVolume;

    float                   mRightVolume;

    float                   mVolume;

    AudioPlaybackRate       mPlaybackRate;

    uint32_t                mSampleRateHz; // sample rate of the content, as set in open()

    float                   mMsecsPerFrame;

media/libmediaplayer2/include/mediaplayer2/mediaplayer2.h

+2 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public: 
            status_t        getAudioStreamType(audio_stream_type_t *type);

            status_t        setLooping(int loop);

            bool            isLooping();

            status_t        setVolume(float leftVolume, float rightVolume);

            status_t        setVolume(float volume);

            void            notify(int64_t srcId, int msg, int ext1, int ext2,

                                   const PlayerMessage *obj = NULL);

            status_t        invoke(const PlayerMessage &request, PlayerMessage *reply);
@@ -142,8 +142,7 @@ private: 
    audio_stream_type_t         mStreamType;

    Parcel*                     mAudioAttributesParcel;

    bool                        mLoop;

    float                       mLeftVolume;

    float                       mRightVolume;

    float                       mVolume;

    int                         mVideoWidth;

    int                         mVideoHeight;

    audio_session_t             mAudioSessionId;

media/libmediaplayer2/mediaplayer2.cpp

+6 −7
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ MediaPlayer2::MediaPlayer2() { 
    mSeekMode = MediaPlayer2SeekMode::SEEK_PREVIOUS_SYNC;

    mCurrentState = MEDIA_PLAYER2_IDLE;

    mLoop = false;

    mLeftVolume = mRightVolume = 1.0;

    mVolume = 1.0;

    mVideoWidth = mVideoHeight = 0;

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

    AudioSystem::acquireAudioSessionId(mAudioSessionId, -1);
@@ -630,7 +630,7 @@ status_t MediaPlayer2::start() { 
        mPlayer->setLooping(mLoop);



        if (mAudioOutput != 0) {

            mAudioOutput->setVolume(mLeftVolume, mRightVolume);

            mAudioOutput->setVolume(mVolume);

        }



        if (mAudioOutput != 0) {
@@ -968,13 +968,12 @@ bool MediaPlayer2::isLooping() { 
    return false;

}



status_t MediaPlayer2::setVolume(float leftVolume, float rightVolume) {

    ALOGV("MediaPlayer2::setVolume(%f, %f)", leftVolume, rightVolume);

status_t MediaPlayer2::setVolume(float volume) {

    ALOGV("MediaPlayer2::setVolume(%f)", volume);

    Mutex::Autolock _l(mLock);

    mLeftVolume = leftVolume;

    mRightVolume = rightVolume;

    mVolume = volume;

    if (mAudioOutput != 0) {

        mAudioOutput->setVolume(leftVolume, rightVolume);

        mAudioOutput->setVolume(volume);

    }

    return OK;

}