commit eff63f86fd7eb7b3922379db520557a1048d26e0
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 29 04:06:17 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 29 04:06:17 2020 +0000
tree 70f7e83d9e019e2ffb7bec52c7fe20e775dec99d
parent 71e8b09645f09fa565b3d9e9e3d353a6b030d786
parent 3dcbdaeffb2e8b60f436f3685e99d343da76468a

Merge "DO NOT MERGE -- Skip QQ2A.200305.003 in stage-aosp-master" into stage-aosp-master

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 65d7a39..78ddd6d 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1286,7 +1286,8 @@
     {
         Mutexed<Config>::Locked config(mConfig);
         inputFormat = config->mInputFormat;
-        outputFormat = config->mOutputFormat;
+        // start triggers format dup
+        outputFormat = config->mOutputFormat = config->mOutputFormat->dup();
         if (config->mInputSurface) {
             err2 = config->mInputSurface->start();
         }

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 5f969db..a4c30fa 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1073,7 +1073,7 @@
         } else {
             output->buffers.reset(new LinearOutputBuffers(mName));
         }
-        output->buffers->setFormat(outputFormat->dup());
+        output->buffers->setFormat(outputFormat);
 
 
         // Try to set output surface to created block pool if given.