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

Commit c4fd8b3b authored by Ronghua Wu's avatar Ronghua Wu Committed by Android Git Automerger
Browse files

am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev 

* commit 'b220fe0e':
  stagefright: fix fake-stride handling for H263 SW decoder
parents 3a8bad2e b220fe0e

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

+3 −2
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ void SoftMPEG4::onQueueFilled(OMX_U32 /* portIndex */) { 
                (mMode == MODE_MPEG4) ? MPEG4_MODE : H263_MODE;



            Bool success = PVInitVideoDecoder(

                    mHandle, vol_data, &vol_size, 1, mWidth, mHeight, mode);

                    mHandle, vol_data, &vol_size, 1,

                    outputBufferWidth(), outputBufferHeight(), mode);



            if (!success) {

                ALOGW("PVInitVideoDecoder failed. Unsupported content?");
@@ -321,7 +322,7 @@ bool SoftMPEG4::handlePortSettingsChange() { 


            vol_data[0] = NULL;

            if (!PVInitVideoDecoder(

                    mHandle, vol_data, &vol_size, 1, mWidth, mHeight,

                    mHandle, vol_data, &vol_size, 1, outputBufferWidth(), outputBufferHeight(),

                    H263_MODE)) {

                notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);

                mSignalledError = true;

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

+8 −1
Original line number Diff line number Diff line
@@ -166,8 +166,15 @@ void SoftVideoDecoderOMXComponent::handlePortSettingsChange( 
    bool sizeChanged = (width != mWidth || height != mHeight);

    bool updateCrop = (cropSettingsMode == kCropUnSet);

    bool cropChanged = (cropSettingsMode == kCropChanged);

    bool strideChanged = false;

    if (fakeStride) {

        OMX_PARAM_PORTDEFINITIONTYPE *def = &editPortInfo(kOutputPortIndex)->mDef;

        if (def->format.video.nStride != width || def->format.video.nSliceHeight != height) {

            strideChanged = true;

        }

    }



    if (sizeChanged || cropChanged) {

    if (sizeChanged || cropChanged || strideChanged) {

        mWidth = width;

        mHeight = height;