diff options
| author | Andreas Huber <andih@google.com> | 2010-09-09 10:10:15 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-09-09 10:10:15 -0700 |
| commit | 49110ce0ed95918c85eebe6e09e900b905b37e23 (patch) | |
| tree | f1791412fd98d4b6542721f5ca523b5b36001a16 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 772bcc27ba7c1fd42c72ecaca55d533328bd18e7 (diff) | |
| download | frameworks_av-49110ce0ed95918c85eebe6e09e900b905b37e23.zip frameworks_av-49110ce0ed95918c85eebe6e09e900b905b37e23.tar.gz frameworks_av-49110ce0ed95918c85eebe6e09e900b905b37e23.tar.bz2 | |
Instead of asserting return a runtime error if the maximum sample size cannot be determined.
Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac
related-to-bug: 2602446
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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 |