| commit | cd5a3d2fab2af6a7300268599fbc4373d4c00cf3 | [log] [tgz] |
|---|---|---|
| author | Ram Mohan M <ram.mohan@ittiam.com> | Thu Jun 08 08:15:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 08 08:15:20 2017 +0000 |
| tree | d8df56795291850d6231d9793270afd02434a938 | |
| parent | bfcfa00534254516a597ecb9d8b268f46f374ad2 [diff] | |
| parent | 610bc72b09396af03d5020bd34e390ad23208357 [diff] |
Merge "Bug fix: timestamp deviation fail test" into oc-dev am: 610bc72b09 Change-Id: I407c9b8bd8b8b222d8c811078158a0523a0283ae
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) {