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

Commit 8cf31a5a 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: cd5a3d2f

Change-Id: I27d5443e1387526156068fcb8015f14f743127ac
parents c7099161 cd5a3d2f

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) {