summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
diff options
context:
space:
mode:
authorHaynes Mathew George <hgeorge@codeaurora.org>2015-10-11 15:58:18 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-10-24 00:25:10 -0700
commitbecef43b5ee49c14fad7ef73f390ea17f4cb6700 (patch)
tree1f7c25e1f8688467a2533834264db15e8c631005 /media/libmediaplayerservice/nuplayer/NuPlayer.cpp
parent27194a9abb4fbeeac4efc8c14aab127f8550742e (diff)
downloadframeworks_av-becef43b5ee49c14fad7ef73f390ea17f4cb6700.zip
frameworks_av-becef43b5ee49c14fad7ef73f390ea17f4cb6700.tar.gz
frameworks_av-becef43b5ee49c14fad7ef73f390ea17f4cb6700.tar.bz2
Nuplayer: Ensure AudioSink is closed before clearing Renderer
Close AudioSink object explicitly before clearing NuPlayerRenderer to avoid race conditions between NuPlayerRenderer and AudioSink callback thread. CRs-Fixed: 927545 Change-Id: Id6cef83bc8e4b6f581641b19b0bbd29eee3704bb
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 6305a02..4e5549f 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1169,6 +1169,9 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) {
FLUSH_CMD_SHUTDOWN /* video */));
mDeferredActions.push_back(
+ new SimpleAction(&NuPlayer::closeAudioSink));
+
+ mDeferredActions.push_back(
new SimpleAction(&NuPlayer::performReset));
processDeferredActions();