diff options
| author | Andreas Huber <andih@google.com> | 2010-05-13 09:15:21 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-05-13 09:19:35 -0700 |
| commit | a945bfd91aa291fba4d9201ffcb38fce40eab7fe (patch) | |
| tree | daf784212302922f821dbcf99d85e55697ac610d /media/libstagefright/codecs | |
| parent | d2333bda49f9d76f1b30b81dfc093d407bc6dbf0 (diff) | |
| download | frameworks_av-a945bfd91aa291fba4d9201ffcb38fce40eab7fe.zip frameworks_av-a945bfd91aa291fba4d9201ffcb38fce40eab7fe.tar.gz frameworks_av-a945bfd91aa291fba4d9201ffcb38fce40eab7fe.tar.bz2 | |
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Change-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a
related-to-bug: 2682221
QA-impact: none
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/AACDecoder.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacdec/AACDecoder.cpp b/media/libstagefright/codecs/aacdec/AACDecoder.cpp index ae23691..2bc4448 100644 --- a/media/libstagefright/codecs/aacdec/AACDecoder.cpp +++ b/media/libstagefright/codecs/aacdec/AACDecoder.cpp @@ -90,8 +90,10 @@ status_t AACDecoder::start(MetaData *params) { mConfig->pOutputBuffer_plus = NULL; mConfig->repositionFlag = false; - CHECK_EQ(PVMP4AudioDecoderConfig(mConfig, mDecoderBuf), - MP4AUDEC_SUCCESS); + if (PVMP4AudioDecoderConfig(mConfig, mDecoderBuf) + != MP4AUDEC_SUCCESS) { + return ERROR_UNSUPPORTED; + } } mSource->start(); |