| commit | 610bc72b09396af03d5020bd34e390ad23208357 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 08 08:08:25 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 08 08:08:27 2017 +0000 |
| tree | 4b1acca1543c8faea6e0205099ae56efdbad01b9 | |
| parent | fa77e3f5e89a28c6c94dc6ab381947fb52e58fa7 [diff] | |
| parent | 8437f4e9094567affaa72ba7bfab654e12e78399 [diff] |
Merge "Bug fix: timestamp deviation fail test" into oc-dev
diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp index 78436f6..248ab6d 100644 --- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp +++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
@@ -644,6 +644,7 @@ handlePortSettingsChange(&portWillReset, width, height); if (portWillReset) { resetDecoder(); + resetPlugin(); return; } } else if (mUpdateColorAspects) {
diff --git a/media/libstagefright/codecs/hevcdec/SoftHEVC.cpp b/media/libstagefright/codecs/hevcdec/SoftHEVC.cpp index a3fd336..2745087 100644 --- a/media/libstagefright/codecs/hevcdec/SoftHEVC.cpp +++ b/media/libstagefright/codecs/hevcdec/SoftHEVC.cpp
@@ -635,6 +635,7 @@ if (portWillReset) { resetDecoder(); + resetPlugin(); return; } } else if (mUpdateColorAspects) {
diff --git a/media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp b/media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp index ce28faf..8a569c9 100644 --- a/media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp +++ b/media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp
@@ -752,6 +752,7 @@ if (portWillReset) { resetDecoder(); + resetPlugin(); return; } } else if (mUpdateColorAspects) {