diff options
| author | Andreas Huber <andih@google.com> | 2011-01-10 11:57:30 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-01-10 11:57:30 -0800 |
| commit | b736cb28ab414c16b9cd89923a6da3778847cf2a (patch) | |
| tree | 02a5f780236124a120418fd68a083099fc88ef8e /media | |
| parent | 748ba9a9512dee65d5b09cfe26a34ded753f4aab (diff) | |
| download | frameworks_base-b736cb28ab414c16b9cd89923a6da3778847cf2a.zip frameworks_base-b736cb28ab414c16b9cd89923a6da3778847cf2a.tar.gz frameworks_base-b736cb28ab414c16b9cd89923a6da3778847cf2a.tar.bz2 | |
Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
Change-Id: Ie704a72685f749613fa0ed5fa6f461abc0406371
related-to-bug: 3328200
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp b/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp index 0f08f6e..38778fb 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp @@ -132,7 +132,10 @@ status_t M4vH263Decoder::start(MetaData *) { } MP4DecodingMode actualMode = PVGetDecBitstreamMode(mHandle); - CHECK_EQ(mode, actualMode); + if (mode != actualMode) { + PVCleanUpVideoDecoder(mHandle); + return UNKNOWN_ERROR; + } PVSetPostProcType((VideoDecControls *) mHandle, 0); |