summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
diff options
context:
space:
mode:
authorShalaj Jain <shalajj@codeaurora.org>2015-09-22 14:58:34 -0700
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:25:08 -0600
commit69ef79ce3cc954c8a2dbb7fb7f0fcac80a08b73d (patch)
treee32a1e340469bbe50994797b240efed22fe63719 /media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
parent8f18da70cf611d6a2d066b0a7ef43ccc2a3d968f (diff)
downloadframeworks_av-69ef79ce3cc954c8a2dbb7fb7f0fcac80a08b73d.zip
frameworks_av-69ef79ce3cc954c8a2dbb7fb7f0fcac80a08b73d.tar.gz
frameworks_av-69ef79ce3cc954c8a2dbb7fb7f0fcac80a08b73d.tar.bz2
stagefright: Stability fixes
Add a null check around MediaCodec release to avoid the warning from AMessage about target handler being gone. Add bufferlock in updateBuffer to avoid race condition between info->mFormat being assigned to mOutputFormat while mOutputFormat is being updated at the same time. Change-Id: Ibc5a9a79a840d1c15a99be7c74ded1588edf3918
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index 1af2e2d..43589a5 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -79,7 +79,9 @@ NuPlayer::Decoder::Decoder(
}
NuPlayer::Decoder::~Decoder() {
- mCodec->release();
+ if (mCodec != NULL) {
+ mCodec->release();
+ }
releaseAndResetMediaBuffers();
}