From 49110ce0ed95918c85eebe6e09e900b905b37e23 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 9 Sep 2010 10:10:15 -0700 Subject: Instead of asserting return a runtime error if the maximum sample size cannot be determined. Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac related-to-bug: 2602446 --- media/libstagefright/MPEG4Extractor.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'media') diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index ba90407..4bbc251 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -872,7 +872,11 @@ status_t MPEG4Extractor::parseChunk(off_t *offset, int depth) { } size_t max_size; - CHECK_EQ(mLastTrack->sampleTable->getMaxSampleSize(&max_size), OK); + err = mLastTrack->sampleTable->getMaxSampleSize(&max_size); + + if (err != OK) { + return err; + } // Assume that a given buffer only contains at most 10 fragments, // each fragment originally prefixed with a 2 byte length will -- cgit v1.1