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

Commit 878d8c50 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of av-aosp.lnx.2.0-00003. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1052767   Ifc29123ccc9d4e537529e356f59049a0dfeb024b   libstagefright: Handling SSR/Hardware error in Camcorder
1052767   I487d96f855f541033e8ec7872e86d00bafb96daf   libstagefright: Add error handling in mediacodecsource

Change-Id: Ia5a494006815fb5f8faf638e69f16fe0ac9f3b4b
CRs-Fixed: 1052767
parents fe763e1d 2e9400f6

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2717,7 +2717,7 @@ status_t MPEG4Writer::Track::threadEntry() { 
    // if err is ERROR_IO (ex: during SSR), return OK to save the

    // recorded file successfully. Session tear down will happen as part of

    // client callback

    if ((mIsAudio && (err == ERROR_IO)) || (err == ERROR_END_OF_STREAM)) {

    if ((err == ERROR_IO) || (err == ERROR_END_OF_STREAM)) {

        return OK;

    }

    return err;

media/libstagefright/MediaCodecSource.cpp

100644 → 100755
+5 −1
Original line number Diff line number Diff line
@@ -600,8 +600,12 @@ void MediaCodecSource::signalEOS(status_t err) { 
            output->mBufferQueue.clear();

            output->mEncoderReachedEOS = true;

            output->mErrorCode = err;

            if (err == OMX_ErrorHardware) {

            if (err != ERROR_END_OF_STREAM) {

                output->mErrorCode = ERROR_IO;

                if (!(mFlags & FLAG_USE_SURFACE_INPUT)) {

                    mStopping = true;

                    mPuller->stop();

                }

            }

            output->mCond.signal();