Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recover from a certain mp3 decoder error instead of signalling an error and thereby stopping decoding.

Browse Source
This commit is contained in:
Andreas Huber
2010-02-24 13:19:04 -08:00
parent 875d259c95
commit ff0c5c1929
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
media/libstagefright/codecs/mp3dec/MP3Decoder.cpp
View File

@@ -160,14 +160,25 @@ status_t MP3Decoder::read(
mConfig->outputFrameSize = buffer->size() / sizeof(int16_t);
mConfig->pOutputBuffer = static_cast<int16_t *>(buffer->data());
if (pvmp3_framedecoder(mConfig, mDecoderBuf) != NO_DECODING_ERROR) {
buffer->release();
buffer = NULL;
ERROR_CODE decoderErr;
if ((decoderErr = pvmp3_framedecoder(mConfig, mDecoderBuf))
!= NO_DECODING_ERROR) {
LOGV("mp3 decoder returned error %d", decoderErr);
mInputBuffer->release();
mInputBuffer = NULL;
if (decoderErr != NO_ENOUGH_MAIN_DATA_ERROR) {
buffer->release();
buffer = NULL;
return UNKNOWN_ERROR;
mInputBuffer->release();
mInputBuffer = NULL;
return UNKNOWN_ERROR;
}
// This is recoverable, just ignore the current frame and
// play silence instead.
memset(buffer->data(), 0, mConfig->outputFrameSize);
mConfig->inputBufferUsedLength = mInputBuffer->range_length();
}
buffer->set_range(