Merge "The mp3 decoder should not assert that decoding was successful but return an error instead."

2010-01-11 16:08:56 -08:00
parent 25391832fc afce2158a2
commit 593c6a5516
1 changed files with 6 additions and 1 deletions
--- 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));