summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2016-10-11 08:41:51 -0700
committergitbuildkicker <android-build@google.com>2016-10-11 16:23:06 -0700
commitc13a507aa0badeb5f8482c25e2845780ba021ce7 (patch)
tree670d1637a71b6d2f90b65cab92bb5f5e4bd99359 /media
parentc2a27ba1c949d1409f75bfef5cc052b7d88e4610 (diff)
downloadframeworks_av-c13a507aa0badeb5f8482c25e2845780ba021ce7.zip
frameworks_av-c13a507aa0badeb5f8482c25e2845780ba021ce7.tar.gz
frameworks_av-c13a507aa0badeb5f8482c25e2845780ba021ce7.tar.bz2
stagefright: don't fail MediaCodec.configure if clients use store-meta key
Even though storing metadata is not supported in MediaCodec.configure and is only meant to be used by Stagefright recorder, don't fail configure. Bug: 31986922 Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be (cherry picked from commit ae52fd383a43ac239f459078fd003ce8ac2efb55)
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/ACodec.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 6399b79..cd2408b 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -1655,7 +1655,10 @@ status_t ACodec::configureCodec(
ALOGE("[%s] storeMetaDataInBuffers (input) failed w/ err %d",
mComponentName.c_str(), err);
- return err;
+ if (mOMX->livesLocally(mNode, getpid())) {
+ return err;
+ }
+ ALOGI("ignoring failure to use internal MediaCodec key.");
}
// For this specific case we could be using camera source even if storeMetaDataInBuffers
// returns Gralloc source. Pretend that we are; this will force us to use nBufferSize.