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

Commit 33e3e657 authored by Chong Zhang's avatar Chong Zhang Committed by Android Git Automerger
Browse files

am 41a54d70: am 8f0547a9: Merge "SoftAVCDec: init decoder using updated size" into mnc-dev 

* commit '41a54d70':
  SoftAVCDec: init decoder using updated size
parents cbe2964f 41a54d70

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -526,6 +526,8 @@ OMX_ERRORTYPE SoftAVC::internalSetParameter(OMX_INDEXTYPE index, const OMX_PTR p 
    const uint32_t oldHeight = mHeight;

    const uint32_t oldHeight = mHeight;

    OMX_ERRORTYPE ret = SoftVideoDecoderOMXComponent::internalSetParameter(index, params);

    OMX_ERRORTYPE ret = SoftVideoDecoderOMXComponent::internalSetParameter(index, params);

    if (mWidth != oldWidth || mHeight != oldHeight) {

    if (mWidth != oldWidth || mHeight != oldHeight) {

        mNewWidth = mWidth;

        mNewHeight = mHeight;

        status_t err = reInitDecoder(mNewWidth, mNewHeight);

        status_t err = reInitDecoder(mNewWidth, mNewHeight);

        if (err != OK) {

        if (err != OK) {

            notify(OMX_EventError, OMX_ErrorUnsupportedSetting, err, NULL);

            notify(OMX_EventError, OMX_ErrorUnsupportedSetting, err, NULL);