summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-10 11:57:30 -0800
committerAndreas Huber <andih@google.com>2011-01-10 11:57:30 -0800
commit0ecfbd1cf37dbfb44d19c27351f5769309ac028d (patch)
tree11b98dba45992626a17714e04272cdb3fd0fe930 /media/libstagefright/codecs
parent32ad210e4e4bcbdf912a01c9d2ff105cb3c5056f (diff)
downloadframeworks_av-0ecfbd1cf37dbfb44d19c27351f5769309ac028d.zip
frameworks_av-0ecfbd1cf37dbfb44d19c27351f5769309ac028d.tar.gz
frameworks_av-0ecfbd1cf37dbfb44d19c27351f5769309ac028d.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/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp5
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);