diff options
| author | Eric Laurent <elaurent@google.com> | 2013-10-16 15:29:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-16 15:29:41 -0700 |
| commit | a529ee78d7cc5d94cbe79cea2d7e6469c88a0fba (patch) | |
| tree | 24369e40adfec7dabca885dd28bb7f3870bf5d02 /media | |
| parent | 3278eed31fcf82045ac00dcd549dda5270c88971 (diff) | |
| parent | ace8947dbcd18e86c6a089291ffe1ce32fb42508 (diff) | |
| download | frameworks_av-a529ee78d7cc5d94cbe79cea2d7e6469c88a0fba.zip frameworks_av-a529ee78d7cc5d94cbe79cea2d7e6469c88a0fba.tar.gz frameworks_av-a529ee78d7cc5d94cbe79cea2d7e6469c88a0fba.tar.bz2 | |
am ace8947d: am d5766875: AwesomePlayer: fix concurrent pause and teardown
* commit 'ace8947dbcd18e86c6a089291ffe1ce32fb42508':
AwesomePlayer: fix concurrent pause and teardown
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 6 |
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; } |