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

Commit 8772f84f authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "m4v_h263: check header first before decoding a frame." into lmp-dev

am: 6aed93d5

Change-Id: I3fc4c73813fa895796747b63ee849988f94f671a
parents 3b1a9c3f 6aed93d5
Loading
Loading
Loading
Loading
+19 −4
Original line number Diff line number Diff line
@@ -248,13 +248,28 @@ void SoftMPEG4::onQueueFilled(OMX_U32 /* portIndex */) {
            mSignalledError = true;
            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 (handlePortSettingsChange()) {
            return;
        }

        // 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.
        // ignore whatever it says...
        if (PVDecodeVideoFrame(
                    mHandle, &bitstream, &timestamp, &tmp,
                    &useExtTimestamp,
                    outHeader->pBuffer) != PV_TRUE) {
        if (PVDecodeVopBody(mHandle, &tmp) != PV_TRUE) {
            ALOGE("failed to decode video frame.");

            notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);