summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-09-24 23:54:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-24 23:54:22 +0000
commit50373731b2438912e467ae34c92c712bb84d8a75 (patch)
tree098c985a143d6978f77171d45a9a6a412d87ce74 /media
parentf74023f0fbd35b4e9382703dd34c14b440f3da43 (diff)
parent4923cee4fb3b29538d8f46bceeea7d5128242a71 (diff)
downloadframeworks_av-50373731b2438912e467ae34c92c712bb84d8a75.zip
frameworks_av-50373731b2438912e467ae34c92c712bb84d8a75.tar.gz
frameworks_av-50373731b2438912e467ae34c92c712bb84d8a75.tar.bz2
Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into lmp-dev
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