summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-10-16 15:26:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-16 15:26:52 -0700
commitace8947dbcd18e86c6a089291ffe1ce32fb42508 (patch)
tree8f88a9fbbfabc0bef9937a120feffcf6a29a749f /media
parent8580679e1780617d978d28a43e932314b86608ce (diff)
parentd576687570f19f3956d91c1d3da10d965e34c407 (diff)
downloadframeworks_av-ace8947dbcd18e86c6a089291ffe1ce32fb42508.zip
frameworks_av-ace8947dbcd18e86c6a089291ffe1ce32fb42508.tar.gz
frameworks_av-ace8947dbcd18e86c6a089291ffe1ce32fb42508.tar.bz2
am d5766875: AwesomePlayer: fix concurrent pause and teardown
* commit 'd576687570f19f3956d91c1d3da10d965e34c407': AwesomePlayer: fix concurrent pause and teardown
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/AwesomePlayer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index be6719a..c912f75 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1225,6 +1225,12 @@ status_t AwesomePlayer::pause() {
status_t AwesomePlayer::pause_l(bool at_eos) {
if (!(mFlags & PLAYING)) {
+ if (mAudioTearDown && mAudioTearDownWasPlaying) {
+ ALOGV("pause_l() during teardown and finishSetDataSource_l() mFlags %x" , mFlags);
+ mAudioTearDownWasPlaying = false;
+ notifyListener_l(MEDIA_PAUSED);
+ mMediaRenderingStartGeneration = ++mStartGeneration;
+ }
return OK;
}