OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f3a6234
)
AwesomePlayer: ensure STARTED message works after reset
author
Lajos Molnar
<lajos@google.com>
Mon, 28 Oct 2013 22:01:15 +0000
(15:01 -0700)
committer
Lajos Molnar
<lajos@google.com>
Mon, 28 Oct 2013 23:53:13 +0000
(16:53 -0700)
Change-Id: I06217c07c0b68476cb296fd6151f6a0d8d4e02d0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11412881
media/libstagefright/AwesomePlayer.cpp
patch
|
blob
|
history
diff --git
a/media/libstagefright/AwesomePlayer.cpp
b/media/libstagefright/AwesomePlayer.cpp
index
52bd896
..
e1f6563
100644
(file)
--- 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();