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

Commit e8c9a8f7 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "Fix NuPlayer::Decoder input buffer loss upon seamless format change"

parents 6d32d81f c5eef081

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+3 −6
Original line number Diff line number Diff line
@@ -602,11 +602,11 @@ status_t NuPlayer::Decoder::fetchInputData(sp<AMessage> &reply) { 
                    // output queue, and handles it in renderer instead.

                    rememberCodecSpecificData(newFormat);

                    onFlush(false /* notifyComplete */);

                    err = OK;

                    continue;

                } else if (seamlessFormatChange) {

                    // reuse existing decoder and don't flush

                    rememberCodecSpecificData(newFormat);

                    err = OK;

                    continue;

                } else {

                    // This stream is unaffected by the discontinuity

                    return -EWOULDBLOCK;
@@ -696,10 +696,7 @@ bool NuPlayer::Decoder::onInputBufferFetched(const sp<AMessage> &msg) { 
        int32_t streamErr = ERROR_END_OF_STREAM;

        CHECK(msg->findInt32("err", &streamErr) || !hasBuffer);



        if (streamErr == OK) {

            /* buffers are returned to hold on to */

            return true;

        }

        CHECK(streamErr != OK);



        // attempt to queue EOS

        status_t err = mCodec->queueInputBuffer(