diff options
| author | Lajos Molnar <lajos@google.com> | 2013-10-30 13:28:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-30 13:28:36 -0700 |
| commit | ed94a039088d2218cbc69e831f16f78db53d0c83 (patch) | |
| tree | fe7fc816842852ca553d25df68e359672e6c3676 | |
| parent | 85da44b75c0f9426875ccc1bc3df1729e452c5ae (diff) | |
| parent | 8578eb364799f83c6f237d286e1447c02db6afbc (diff) | |
| download | frameworks_av-ed94a039088d2218cbc69e831f16f78db53d0c83.zip frameworks_av-ed94a039088d2218cbc69e831f16f78db53d0c83.tar.gz frameworks_av-ed94a039088d2218cbc69e831f16f78db53d0c83.tar.bz2 | |
am 8578eb36: am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
* commit '8578eb364799f83c6f237d286e1447c02db6afbc':
AwesomePlayer: ensure STARTED message works after reset
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 52bd896..e1f6563 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -606,6 +606,9 @@ void AwesomePlayer::reset_l() { mWatchForAudioSeekComplete = false; mWatchForAudioEOS = false; + + mMediaRenderingStartGeneration = 0; + mStartGeneration = 0; } void AwesomePlayer::notifyListener_l(int msg, int ext1, int ext2) { @@ -895,6 +898,8 @@ status_t AwesomePlayer::play_l() { return OK; } + mMediaRenderingStartGeneration = ++mStartGeneration; + if (!(mFlags & PREPARED)) { status_t err = prepare_l(); |