diff options
| author | Andreas Huber <andih@google.com> | 2010-01-11 16:08:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-11 16:08:56 -0800 |
| commit | 593c6a551663efb33802fa4aaa475f3be6a6d1b4 (patch) | |
| tree | 42d817060993ebdd11bc0935926db3070735fdc1 /media | |
| parent | 25391832fc90694c74248ace5578638e5bfcf80c (diff) | |
| parent | afce2158a26a7aca66a6ea8344cc7bc73ab965d3 (diff) | |
| download | frameworks_base-593c6a551663efb33802fa4aaa475f3be6a6d1b4.zip frameworks_base-593c6a551663efb33802fa4aaa475f3be6a6d1b4.tar.gz frameworks_base-593c6a551663efb33802fa4aaa475f3be6a6d1b4.tar.bz2 | |
Merge "The mp3 decoder should not assert that decoding was successful but return an error instead."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/mp3dec/MP3Decoder.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp b/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp index 2f919c2..c115b18 100644 --- a/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp +++ b/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp @@ -160,7 +160,12 @@ status_t MP3Decoder::read( mConfig->outputFrameSize = buffer->size() / sizeof(int16_t); mConfig->pOutputBuffer = static_cast<int16_t *>(buffer->data()); - CHECK_EQ(pvmp3_framedecoder(mConfig, mDecoderBuf), NO_DECODING_ERROR); + if (pvmp3_framedecoder(mConfig, mDecoderBuf) != NO_DECODING_ERROR) { + mInputBuffer->release(); + mInputBuffer = NULL; + + return UNKNOWN_ERROR; + } buffer->set_range( 0, mConfig->outputFrameSize * sizeof(int16_t)); |