summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorDiogo Ferreira <defer@cyngn.com>2015-11-19 18:48:52 +0000
committerSteve Kondik <shade@chemlab.org>2015-11-20 14:41:14 -0800
commiteeb8a90192cee627890a74f75a0c64145fbc34f4 (patch)
tree8f7a90455548d7b2d570707b4f85e21f7e7a2882 /media/libstagefright/ACodec.cpp
parentab77bc7189e49fd35e8638509df9d2c090f23817 (diff)
downloadframeworks_av-eeb8a90192cee627890a74f75a0c64145fbc34f4.zip
frameworks_av-eeb8a90192cee627890a74f75a0c64145fbc34f4.tar.gz
frameworks_av-eeb8a90192cee627890a74f75a0c64145fbc34f4.tar.bz2
stagefright: ACodec: Don't return success when encoders fail to init
When configureCodec fails we try to fallback to another codec that supports the mimeType. However, this fallback is only done for decoders and, if encoders fail, they will always end up sending a success notification and returning true, causing mediaserver to crash. Change-Id: I32bee3167a8b43243cd708258435174f90f21a1b
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-rw-r--r--media/libstagefright/ACodec.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index a8e4e02..eddd7ba 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -5859,11 +5859,11 @@ bool ACodec::LoadedState::onConfigureComponent(
mCodec->mComponentName = componentName;
err = mCodec->configureCodec(mime.c_str(), msg);
+ }
- if (err != OK) {
- mCodec->signalError((OMX_ERRORTYPE)err, makeNoSideEffectStatus(err));
- return false;
- }
+ if (err != OK) {
+ mCodec->signalError((OMX_ERRORTYPE)err, makeNoSideEffectStatus(err));
+ return false;
}
}