summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-09-25 18:31:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-25 18:31:51 +0000
commit3709974f26e9661d512ae995123f2b22db51dc66 (patch)
tree904f1641f16b55a4c6b1cce6a9f4739d0a4c472d /media
parent3e07240000ed8df9f77733962850ee4ddbea0c7f (diff)
parent50373731b2438912e467ae34c92c712bb84d8a75 (diff)
downloadframeworks_av-3709974f26e9661d512ae995123f2b22db51dc66.zip
frameworks_av-3709974f26e9661d512ae995123f2b22db51dc66.tar.gz
frameworks_av-3709974f26e9661d512ae995123f2b22db51dc66.tar.bz2
am 50373731: Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into lmp-dev
* commit '50373731b2438912e467ae34c92c712bb84d8a75': NuPlayerDecoder: release MediaBuffers when decoder is deleted.
Diffstat (limited to 'media')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index cdb860c..1b1b1c8 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -53,6 +53,10 @@ NuPlayer::Decoder::Decoder(
}
NuPlayer::Decoder::~Decoder() {
+ mDecoderLooper->unregisterHandler(id());
+ mDecoderLooper->stop();
+
+ releaseAndResetMediaBuffers();
}
static