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

Commit a9e905f6 authored by Wei Jia's avatar Wei Jia Committed by WolfEnders
Browse files

m4v_h263: check header first before decoding a frame. 

Test: fix the file in the bug
Bug: 37660827
Change-Id: I9d6919f96c0c9f29221be1e8e852ecb21062bad9
(cherry picked from commit db545366c2e893dbbe1a42d858c52067101beda6)
(cherry picked from commit 38142b60)
parent 1a516216

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

+19 −4
Original line number Original line Diff line number Diff line
@@ -239,13 +239,28 @@ void SoftMPEG4::onQueueFilled(OMX_U32 portIndex) { 
            mSignalledError = true;

            mSignalledError = true;

            return;

            return;

        }

        }



        // Need to check if header contains new info, e.g., width/height, etc.

        VopHeaderInfo header_info;

        uint8_t *bitstreamTmp = bitstream;

        if (PVDecodeVopHeader(

                    mHandle, &bitstreamTmp, &timestamp, &tmp,

                    &header_info, &useExtTimestamp,

                    outHeader->pBuffer) != PV_TRUE) {

            ALOGE("failed to decode vop header.");



            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

            mSignalledError = true;

            return;

        }

        if (portSettingsChanged()) {

            return;

        }



        // The PV decoder is lying to us, sometimes it'll claim to only have

        // The PV decoder is lying to us, sometimes it'll claim to only have

        // consumed a subset of the buffer when it clearly consumed all of it.

        // consumed a subset of the buffer when it clearly consumed all of it.

        // ignore whatever it says...

        // ignore whatever it says...

        if (PVDecodeVideoFrame(

        if (PVDecodeVopBody(mHandle, &tmp) != PV_TRUE) {

                    mHandle, &bitstream, &timestamp, &tmp,

                    &useExtTimestamp,

                    outHeader->pBuffer) != PV_TRUE) {

            ALOGE("failed to decode video frame.");

            ALOGE("failed to decode video frame.");





            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);