Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3de352 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "NuPlayer: handle source error correctly."

parents 2581a93b 231fd353

media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp

+3 −0
Original line number Diff line number Diff line
@@ -294,6 +294,9 @@ void NuPlayer::DecoderPassThrough::onInputBufferFetched( 
            return;

        }



        if (streamErr != ERROR_END_OF_STREAM) {

            handleError(streamErr);

        }

        mReachedEOS = true;

        if (mRenderer != NULL) {

            mRenderer->queueEOS(true /* audio */, ERROR_END_OF_STREAM);

media/libstagefright/MP3Extractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ status_t MP3Source::read( 
            buffer->release();

            buffer = NULL;



            return ERROR_END_OF_STREAM;

            return (n < 0 ? n : ERROR_END_OF_STREAM);

        }



        uint32_t header = U32_AT((const uint8_t *)buffer->data());
@@ -582,7 +582,7 @@ status_t MP3Source::read( 
        buffer->release();

        buffer = NULL;



        return ERROR_END_OF_STREAM;

        return (n < 0 ? n : ERROR_END_OF_STREAM);

    }



    buffer->set_range(0, frame_size);