drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
This commit is contained in:
Andreas Huber
2011-03-28 08:16:52 -07:00
committed by Android Git Automerger
parent 9eac2c077a 2edbdcc6f2
commit e7cedad2b8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/libstagefright/AudioPlayer.cpp
View File

@ -405,6 +405,10 @@ int64_t AudioPlayer::getMediaTimeUs() {
Mutex::Autolock autoLock(mLock); Mutex::Autolock autoLock(mLock);
if (mPositionTimeMediaUs < 0 || mPositionTimeRealUs < 0) { if (mPositionTimeMediaUs < 0 || mPositionTimeRealUs < 0) {
if (mSeeking) {
return mSeekTimeUs;
}
return 0; return 0;
} }
@ -430,6 +434,7 @@ status_t AudioPlayer::seekTo(int64_t time_us) {
Mutex::Autolock autoLock(mLock); Mutex::Autolock autoLock(mLock);
mSeeking = true; mSeeking = true;
mPositionTimeRealUs = mPositionTimeMediaUs = -1;
mReachedEOS = false; mReachedEOS = false;
mSeekTimeUs = time_us; mSeekTimeUs = time_us;