summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-10-25 04:36:50 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-10-25 04:36:50 -0700
commitdb91f16dcfa6b34a6802ae4daf280d34a09a9cf3 (patch)
tree6c0ce8befdedbaeb8e317e1f841cc4d6f6b5d12d
parent0328991a62fceee1e27fc8c81fefc188db348cb2 (diff)
parentbecef43b5ee49c14fad7ef73f390ea17f4cb6700 (diff)
downloadframeworks_av-db91f16dcfa6b34a6802ae4daf280d34a09a9cf3.tar.gz
frameworks_av-db91f16dcfa6b34a6802ae4daf280d34a09a9cf3.tar.bz2
frameworks_av-db91f16dcfa6b34a6802ae4daf280d34a09a9cf3.zip
Merge "Nuplayer: Ensure AudioSink is closed before clearing Renderer"
-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 6305a02ca8..4e5549fbe5 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();