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

Commit ab13a89c authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief... 

am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1

* commit 'a4a81aef':
  After a seek there's a brief period where audio time isn't reestablished.
parents 3c630f33 a4a81aef

media/libstagefright/AudioPlayer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -452,6 +452,10 @@ int64_t AudioPlayer::getMediaTimeUs() { 
    Mutex::Autolock autoLock(mLock);



    if (mPositionTimeMediaUs < 0 || mPositionTimeRealUs < 0) {

        if (mSeeking) {

            return mSeekTimeUs;

        }



        return 0;

    }
@@ -477,6 +481,7 @@ status_t AudioPlayer::seekTo(int64_t time_us) { 
    Mutex::Autolock autoLock(mLock);



    mSeeking = true;

    mPositionTimeRealUs = mPositionTimeMediaUs = -1;

    mReachedEOS = false;

    mSeekTimeUs = time_us;