commit c9c79ff6a8ff635b35b8c1a48fde5a1b88c3b9d2
author Ray Essick <essick@google.com> Thu Apr 22 18:56:33 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 22 18:56:33 2021 +0000
tree b4fe7ed2a4ce289c18e6325bcb1a0b4f52c87175
parent b9e7fac177b76e13d4d62cc8696f8a82a95e4196
parent 6bd65a81cea5ac15161f893d94ec962dbc930401

Merge "Add Mpeg4H263DecoderTest to mts test_suite"

media/codec2/components/base/SimpleC2Component.cpp

diff --git a/media/codec2/components/base/SimpleC2Component.cpp b/media/codec2/components/base/SimpleC2Component.cpp
index fb3fbd0..dfad226 100644
--- a/media/codec2/components/base/SimpleC2Component.cpp
+++ b/media/codec2/components/base/SimpleC2Component.cpp
@@ -110,17 +110,20 @@
         }
         case kWhatStop: {
             int32_t err = thiz->onStop();
+            thiz->mOutputBlockPool.reset();
             Reply(msg, &err);
             break;
         }
         case kWhatReset: {
             thiz->onReset();
+            thiz->mOutputBlockPool.reset();
             mRunning = false;
             Reply(msg);
             break;
         }
         case kWhatRelease: {
             thiz->onRelease();
+            thiz->mOutputBlockPool.reset();
             mRunning = false;
             Reply(msg);
             break;

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 0619b9c..8def53d 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -2149,7 +2149,7 @@
             }
 
             // handle configuration changes in work done
-            const C2StreamInitDataInfo::output *initData = nullptr;
+            std::unique_ptr<C2Param> initData;
             sp<AMessage> outputFormat = nullptr;
             {
                 Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
@@ -2227,10 +2227,14 @@
                 if (config->mInputSurface) {
                     config->mInputSurface->onInputBufferDone(work->input.ordinal.frameIndex);
                 }
-                initData = initDataWatcher.hasChanged() ? initDataWatcher.update().get() : nullptr;
+                if (initDataWatcher.hasChanged()) {
+                    initData = C2Param::Copy(*initDataWatcher.update().get());
+                }
                 outputFormat = config->mOutputFormat;
             }
-            mChannel->onWorkDone(std::move(work), outputFormat, initData);
+            mChannel->onWorkDone(
+                    std::move(work), outputFormat,
+                    initData ? (C2StreamInitDataInfo::output *)initData.get() : nullptr);
             break;
         }
         case kWhatWatch: {