diff options
| author | James Dong <jdong@google.com> | 2011-02-25 17:55:42 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-03-11 16:13:15 -0800 |
| commit | 6d8ed9598d526dfe9be983543f125e3178d7c9b1 (patch) | |
| tree | 11656dfa2c2d73b8184aeb99b224f64119ccd04c /media/libstagefright/codecs/mp3dec | |
| parent | 34fba6695fe1b55710baef561785caa0486654fb (diff) | |
| download | frameworks_av-6d8ed9598d526dfe9be983543f125e3178d7c9b1.zip frameworks_av-6d8ed9598d526dfe9be983543f125e3178d7c9b1.tar.gz frameworks_av-6d8ed9598d526dfe9be983543f125e3178d7c9b1.tar.bz2 | |
If MP3 decoder output frame size were 0, media server would crash.
This is to log an error message should that happen.
Change-Id: I0f947cd7a8e6639b4f11a928bf90286a34cc652e
Diffstat (limited to 'media/libstagefright/codecs/mp3dec')
| -rw-r--r-- | media/libstagefright/codecs/mp3dec/MP3Decoder.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp b/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp index 59dd740..0ba42ff 100644 --- a/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp +++ b/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp @@ -14,6 +14,9 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "MP3Decoder" + #include "MP3Decoder.h" #include "include/pvmp3decoder_api.h" @@ -175,7 +178,12 @@ status_t MP3Decoder::read( != NO_DECODING_ERROR) { LOGV("mp3 decoder returned error %d", decoderErr); - if (decoderErr != NO_ENOUGH_MAIN_DATA_ERROR) { + if (decoderErr != NO_ENOUGH_MAIN_DATA_ERROR || + mConfig->outputFrameSize == 0) { + + if (mConfig->outputFrameSize == 0) { + LOGE("Output frame size is 0"); + } buffer->release(); buffer = NULL; |