OSDN Git Service

Instead of asserting return a runtime error if the maximum sample size cannot be...
authorAndreas Huber <andih@google.com>
Thu, 9 Sep 2010 17:10:15 +0000 (10:10 -0700)
committerAndreas Huber <andih@google.com>
Thu, 9 Sep 2010 17:10:15 +0000 (10:10 -0700)
Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac
related-to-bug: 2602446

media/libstagefright/MPEG4Extractor.cpp

index ba90407..4bbc251 100644 (file)
@@ -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