diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 11:51:30 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 11:58:46 -0800 |
| commit | 26c5fa31d17a638bf314de6e12e86bb8a86db44b (patch) | |
| tree | bdc7f3eeafcd04c5194bec6e8f3f2892a52432a0 /media/libstagefright/ACodec.cpp | |
| parent | 1c6e16c0b4082c0edaca4fcc0838f33bf14ffac8 (diff) | |
| parent | c13a507aa0badeb5f8482c25e2845780ba021ce7 (diff) | |
| download | frameworks_av-26c5fa31d17a638bf314de6e12e86bb8a86db44b.zip frameworks_av-26c5fa31d17a638bf314de6e12e86bb8a86db44b.tar.gz frameworks_av-26c5fa31d17a638bf314de6e12e86bb8a86db44b.tar.bz2 | |
Merge tag 'android-6.0.1_r74' into HEAD
CYNGNOS-3303
Android 6.0.1 release 74
Change-Id: I0a14578751f4ecb8d13def26b9ffe5dcba4afd72
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index d2389f6..581bfba 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -1746,7 +1746,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. |