commit ef888a66e6fc1013af4b24fed98f48dfb462ef01
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 01 12:33:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 01 12:33:49 2020 +0000
tree 6fbb677c66db57bba4c0f36594cd64ce9274e5a2
parent 99d82f10d994dba45ca11e3c327836a2e70ba471
parent 110a6641c153c57b43eb676254629ae93ec473ed

Merge "CCodecConfig: don't dup input format" am: a846023716 am: 110a6641c1

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1475736

Change-Id: I8432926b2f50326b73b83efedbd5c7da39ed9508

media/codec2/sfplugin/CCodecConfig.cpp

diff --git a/media/codec2/sfplugin/CCodecConfig.cpp b/media/codec2/sfplugin/CCodecConfig.cpp
index 96f86e8..79c6227 100644
--- a/media/codec2/sfplugin/CCodecConfig.cpp
+++ b/media/codec2/sfplugin/CCodecConfig.cpp
@@ -1151,14 +1151,11 @@
 
     bool changed = false;
     if (domain & mInputDomain) {
-        sp<AMessage> oldFormat = mInputFormat;
-        mInputFormat = mInputFormat->dup(); // trigger format changed
+        sp<AMessage> oldFormat = mInputFormat->dup();
         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) {