diff options
author | Andreas Huber <andih@google.com> | 2011-09-01 11:39:11 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-09-01 11:39:11 -0700 |
commit | 02f6e988107bc13ebe4828b734ea0fc3d9d11ae0 (patch) | |
tree | 33ae71e49d527dba2905559879002be3d48a580b /media/libstagefright/include/AwesomePlayer.h | |
parent | a8e409f8f9b40737d0b03355894b5e141d0aff6b (diff) | |
download | frameworks_av-02f6e988107bc13ebe4828b734ea0fc3d9d11ae0.zip frameworks_av-02f6e988107bc13ebe4828b734ea0fc3d9d11ae0.tar.gz frameworks_av-02f6e988107bc13ebe4828b734ea0fc3d9d11ae0.tar.bz2 |
Guard the audio notifications with a separate lock to avoid deadlocks during reset.
Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392
related-to-bug: 5179827
Diffstat (limited to 'media/libstagefright/include/AwesomePlayer.h')
-rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 24cf77c..8e73121 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -148,6 +148,7 @@ private: mutable Mutex mLock; Mutex mMiscStateLock; mutable Mutex mStatsLock; + Mutex mAudioLock; OMXClient mClient; TimedEventQueue mQueue; @@ -223,7 +224,7 @@ private: void postVideoEvent_l(int64_t delayUs = -1); void postBufferingEvent_l(); void postStreamDoneEvent_l(status_t status); - void postCheckAudioStatusEvent_l(int64_t delayUs); + void postCheckAudioStatusEvent(int64_t delayUs); void postVideoLagEvent_l(); status_t play_l(); @@ -295,7 +296,6 @@ private: void ensureCacheIsFetching_l(); status_t startAudioPlayer_l(bool sendErrorNotification = true); - void postAudioSeekComplete_l(); void shutdownVideoDecoder_l(); status_t setNativeWindow_l(const sp<ANativeWindow> &native); |