commit e3358f6756890daca6801ea094a1e577beb19536
author Wonsik Kim <wonsik@google.com> Wed Mar 24 02:58:19 2021 +0000
committer Wonsik Kim <wonsik@google.com> Wed Mar 24 02:59:24 2021 +0000
tree 012c6c59c6dfc1e3157f6d78623966a3ad4980a7
parent 9c96d25f1184f812adabaa0b20b32da1370f1f63

Revert "CCodecConfig: don't dup input format"

This reverts commit 9c96d25f1184f812adabaa0b20b32da1370f1f63.

Reason for revert: b/180766631
Bug: 169831253
Fixes: 180766631
Change-Id: I6667752d3af816bf1d3bb8e9ca21646a2a978d16

media/codec2/sfplugin/CCodecConfig.cpp

diff --git a/media/codec2/sfplugin/CCodecConfig.cpp b/media/codec2/sfplugin/CCodecConfig.cpp
index 79c6227..96f86e8 100644
--- a/media/codec2/sfplugin/CCodecConfig.cpp
+++ b/media/codec2/sfplugin/CCodecConfig.cpp
@@ -1151,11 +1151,14 @@
 
     bool changed = false;
     if (domain & mInputDomain) {
-        sp<AMessage> oldFormat = mInputFormat->dup();
+        sp<AMessage> oldFormat = mInputFormat;
+        mInputFormat = mInputFormat->dup(); // trigger format changed
         mInputFormat->extend(getFormatForDomain(reflected, mInputDomain));
         if (mInputFormat->countEntries() != oldFormat->countEntries()
                 || mInputFormat->changesFrom(oldFormat)->countEntries() > 0) {
             changed = true;
+        } else {
+            mInputFormat = oldFormat; // no change
         }
     }
     if (domain & mOutputDomain) {