summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-09-25 18:42:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-25 18:42:30 +0000
commit7a90ca027632c8e5220ca24c75856ccd96bba1d3 (patch)
treef1fe0880cd1fdc41d98616a3b4f72b7d3f007ba6 /media/libmediaplayerservice
parent37acc9a2ea028c5dad1c6ea744d6727f6b802501 (diff)
parent3709974f26e9661d512ae995123f2b22db51dc66 (diff)
downloadframeworks_av-7a90ca027632c8e5220ca24c75856ccd96bba1d3.zip
frameworks_av-7a90ca027632c8e5220ca24c75856ccd96bba1d3.tar.gz
frameworks_av-7a90ca027632c8e5220ca24c75856ccd96bba1d3.tar.bz2
am 3709974f: am 50373731: Merge "NuPlayerDecoder: release MediaBuffers when decoder is deleted." into lmp-dev
* commit '3709974f26e9661d512ae995123f2b22db51dc66': NuPlayerDecoder: release MediaBuffers when decoder is deleted.
Diffstat (limited to 'media/libmediaplayerservice')
-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