commit ab8692eb32c8c565b6a8918830d482799700b6dd
author Wonsik Kim <wonsik@google.com> Wed Feb 24 22:01:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 24 22:01:35 2021 +0000
tree 77c80d3d57fd0c11c106b686cb21aa203665f79f
parent c290630e92a4355caee913362bf768e45ae69c8b
parent 6169766b5400927123cd78ed0b7f6664bee3f442

Merge "CCodec: Updates to RevertOutputFormatIfNeeded" am: 6169766b54

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9dc4d0ffa1405a3425e46bdd0c9f1ac98699ef23

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index a88021a..ae50459 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -492,7 +492,10 @@
     // We used to not report changes to these keys to the client.
     const static std::set<std::string> sIgnoredKeys({
             KEY_BIT_RATE,
+            KEY_FRAME_RATE,
             KEY_MAX_BIT_RATE,
+            KEY_MAX_WIDTH,
+            KEY_MAX_HEIGHT,
             "csd-0",
             "csd-1",
             "csd-2",
@@ -1706,7 +1709,9 @@
     {
         Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
         const std::unique_ptr<Config> &config = *configLocked;
+        sp<AMessage> outputFormat = config->mOutputFormat;
         config->queryConfiguration(comp);
+        RevertOutputFormatIfNeeded(outputFormat, config->mOutputFormat);
     }
 
     (void)mChannel->start(nullptr, nullptr, [&]{