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

Commit c24ebce8 authored by Ram Mohan M's avatar Ram Mohan M Committed by android-build-merger
Browse files

Merge "Bug fix: timestamp deviation fail test" into oc-dev am: 610bc72b 

am: 550d4c90

Change-Id: I0744c499da0c11ce4d3835f66cc091b7f9bb4fbe
parents c7099161 550d4c90

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

+1 −0
Original line number Diff line number Diff line
@@ -644,6 +644,7 @@ void SoftAVC::onQueueFilled(OMX_U32 portIndex) { 
                handlePortSettingsChange(&portWillReset, width, height);

                if (portWillReset) {

                    resetDecoder();

                    resetPlugin();

                    return;

                }

            } else if (mUpdateColorAspects) {

media/libstagefright/codecs/hevcdec/SoftHEVC.cpp

+1 −0
Original line number Diff line number Diff line
@@ -635,6 +635,7 @@ void SoftHEVC::onQueueFilled(OMX_U32 portIndex) { 


                if (portWillReset) {

                    resetDecoder();

                    resetPlugin();

                    return;

                }

            } else if (mUpdateColorAspects) {

media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp

+1 −0
Original line number Diff line number Diff line
@@ -752,6 +752,7 @@ void SoftMPEG2::onQueueFilled(OMX_U32 portIndex) { 


                if (portWillReset) {

                    resetDecoder();

                    resetPlugin();

                    return;

                }

            } else if (mUpdateColorAspects) {