diff options
| author | Marco Nelissen <marcone@google.com> | 2014-01-15 14:18:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 14:18:14 -0800 |
| commit | cbf9e91a5ab186904d3dad21eae416c23ee13668 (patch) | |
| tree | 7437b797bddaa76d461a5f0a7a1c64c8ee0b6ee3 /media/libstagefright | |
| parent | 3eccdde99f7063eba4e2788aa7c8c290f7a24120 (diff) | |
| parent | 1e8a57c212d26c41325e950ed629244071acc326 (diff) | |
| download | frameworks_av-cbf9e91a5ab186904d3dad21eae416c23ee13668.zip frameworks_av-cbf9e91a5ab186904d3dad21eae416c23ee13668.tar.gz frameworks_av-cbf9e91a5ab186904d3dad21eae416c23ee13668.tar.bz2 | |
am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"
* commit '1e8a57c212d26c41325e950ed629244071acc326':
Avoid jumps to faulty position after seeks
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 130207d..aae6800 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -2096,7 +2096,10 @@ void AwesomePlayer::onCheckAudioStatus() { mSeekNotificationSent = true; } - mSeeking = NO_SEEK; + if (mVideoSource == NULL) { + // For video the mSeeking flag is always reset in finishSeekIfNecessary + mSeeking = NO_SEEK; + } notifyIfMediaStarted_l(); } |