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

Commit 5367190f authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Return ERROR_END_OF_STREAM when the input source reaches eos"

parents 5faaadff d39e8f4c

media/libstagefright/codecs/avc/enc/AVCEncoder.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -475,7 +475,9 @@ status_t AVCEncoder::read( 
        }

        }

        status_t err = mSource->read(&mInputBuffer, options);

        status_t err = mSource->read(&mInputBuffer, options);

        if (err != OK) {

        if (err != OK) {

            if (err != ERROR_END_OF_STREAM) {

                LOGE("Failed to read input video frame: %d", err);

                LOGE("Failed to read input video frame: %d", err);

            }

            outputBuffer->release();

            outputBuffer->release();

            return err;

            return err;

        }

        }

media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp

+6 −3
Original line number Original line Diff line number Diff line
@@ -398,10 +398,13 @@ status_t M4vH263Encoder::read( 
    }

    }





    // Ready for accepting an input video frame

    // Ready for accepting an input video frame

    if (OK != mSource->read(&mInputBuffer, options)) {

    status_t err = mSource->read(&mInputBuffer, options);

    if (OK != err) {

        if (err != ERROR_END_OF_STREAM) {

            LOGE("Failed to read from data source");

            LOGE("Failed to read from data source");

        }

        outputBuffer->release();

        outputBuffer->release();

        return UNKNOWN_ERROR;

        return err;

    }

    }





    if (mInputBuffer->size() - ((mVideoWidth * mVideoHeight * 3) >> 1) != 0) {

    if (mInputBuffer->size() - ((mVideoWidth * mVideoHeight * 3) >> 1) != 0) {