commit 222db3971b2e8ea93f234f9acfbb124ed1d0948e
author Bo Hu <bohu@google.com> Wed Jan 29 20:24:13 2020 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 29 20:24:13 2020 -0800
tree a987ee41e0a37a1dedd9197dc9cc148f32aedb8e
parent e0b3828d82e8314c936669ff2131e91abddd16a9
parent 474de1ad2dcdf9f2eb50a679a67d52ea1caf7022

Merge "goldfish-codecs: handle width and height change from decoded frame"
am: 474de1ad2d

Change-Id: Ifbe60d326ec49670c6a906dc270b3f746057f1ec

system/codecs/omx/avcdec/GoldfishAVCDec.cpp

diff --git a/system/codecs/omx/avcdec/GoldfishAVCDec.cpp b/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
index bf6cbba..1da4cf0 100644
--- a/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
+++ b/system/codecs/omx/avcdec/GoldfishAVCDec.cpp
@@ -357,6 +357,15 @@
             }
 
             if (img.data != nullptr) {
+                int myWidth = img.width;
+                int myHeight = img.height;
+                if (myWidth != mWidth || myHeight != mHeight) {
+                    bool portWillReset = false;
+                    handlePortSettingsChange(&portWillReset, myWidth, myHeight);
+                    resetPlugin();
+                    mWidth = myWidth;
+                    mHeight = myHeight;
+                }
                 outHeader->nFilledLen =  (outputBufferWidth() * outputBufferHeight() * 3) / 2;
                 int myStride = outputBufferWidth();
                 for (int i=0; i < mHeight; ++i) {