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

Commit 856f37a8 authored by Wei Jia's avatar Wei Jia Committed by Android (Google) Code Review
Browse files

Merge "mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL... 

Merge "mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec." into mnc-dev
parents 9706bfe3 6301a5e9

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+5 −0
Original line number Diff line number Diff line
@@ -414,6 +414,11 @@ bool NuPlayer::Decoder::handleAnInputBuffer(size_t index) { 
    sp<ABuffer> buffer;

    mCodec->getInputBuffer(index, &buffer);



    if (buffer == NULL) {

        handleError(UNKNOWN_ERROR);

        return false;

    }



    if (index >= mInputBuffers.size()) {

        for (size_t i = mInputBuffers.size(); i <= index; ++i) {

            mInputBuffers.add();