Merge "Recover from a certain mp3 decoder error instead of signalling an error...

    mConfig->outputFrameSize = buffer->size() / sizeof(int16_t);

    mConfig->pOutputBuffer = static_cast<int16_t *>(buffer->data());

    if (pvmp3_framedecoder(mConfig, mDecoderBuf) != NO_DECODING_ERROR) {

    ERROR_CODE decoderErr;

    if ((decoderErr = pvmp3_framedecoder(mConfig, mDecoderBuf))

            != NO_DECODING_ERROR) {

        LOGV("mp3 decoder returned error %d", decoderErr);

        if (decoderErr != NO_ENOUGH_MAIN_DATA_ERROR) {

            buffer->release();

            buffer = 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(

            0, mConfig->outputFrameSize * sizeof(int16_t));