summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2016-03-16 10:32:05 -0700
committerThe Android Automerger <android-build@google.com>2016-03-25 17:46:44 -0700
commitf9ed2fe6d61259e779a37d4c2d7edb33a1c1f8ba (patch)
treea5e768aa60bd7ce59fda24188f1c5e028e3ad9c1 /media/libstagefright/omx
parentde2430fd7855b7941250e1c3744756ec9e699bd1 (diff)
downloadframeworks_av-f9ed2fe6d61259e779a37d4c2d7edb33a1c1f8ba.zip
frameworks_av-f9ed2fe6d61259e779a37d4c2d7edb33a1c1f8ba.tar.gz
frameworks_av-f9ed2fe6d61259e779a37d4c2d7edb33a1c1f8ba.tar.bz2
Add VPX output buffer size check
and handle dead observers more gracefully Bug: 27597103 Change-Id: Id7acb25d5ef69b197da15ec200a9e4f9e7b03518
Diffstat (limited to 'media/libstagefright/omx')
-rw-r--r--media/libstagefright/omx/OMX.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index 7f357c9..56b6055 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -179,7 +179,12 @@ void OMX::binderDied(const wp<IBinder> &the_late_who) {
Mutex::Autolock autoLock(mLock);
ssize_t index = mLiveNodes.indexOfKey(the_late_who);
- CHECK(index >= 0);
+
+ if (index < 0) {
+ ALOGE("b/27597103, nonexistent observer on binderDied");
+ android_errorWriteLog(0x534e4554, "27597103");
+ return;
+ }
instance = mLiveNodes.editValueAt(index);
mLiveNodes.removeItemsAt(index);