diff options
| author | Lajos Molnar <lajos@google.com> | 2013-10-30 20:23:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-30 20:23:18 +0000 |
| commit | c76b9f52cf4e39f6943c53f5b3657dfee65857ac (patch) | |
| tree | 6c90ac6f2aa71224889908c3517c300058ba9ccb /media/libstagefright | |
| parent | 1c594b637df26499ce1dae2db34f2b3290efd838 (diff) | |
| parent | f4909f67d8be28e3b0a5e9429479b102773b2ea8 (diff) | |
| download | frameworks_av-c76b9f52cf4e39f6943c53f5b3657dfee65857ac.zip frameworks_av-c76b9f52cf4e39f6943c53f5b3657dfee65857ac.tar.gz frameworks_av-c76b9f52cf4e39f6943c53f5b3657dfee65857ac.tar.bz2 | |
Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
Diffstat (limited to 'media/libstagefright')
| -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(); |