commit 8c53750ec5a4e9e1ccdfd55253d9398187a729d8
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Tue Feb 23 21:20:22 2021 -0800
committer Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed Feb 24 05:56:48 2021 +0000
tree 28409d50c7c75b099a6d793ababea8691cbe89f7
parent d90aeec7d734fab978b550df142ea3bf75be7dd7

CCodec: Updates to RevertOutputFormatIfNeeded

- Ignore signalling the changes in the following as output
  format change.
  KEY_FRAME_RATE, KEY_MAX_WIDTH, KEY_MAX_HEIGHT

- Call RevertOutputFormatIfNeeded in signalResume()

Bug: 180508570
Test: atest CtsMediaTestCases:android.media.cts.AdaptivePlaybackTest

Change-Id: Ic3ebd23b825953454779afc6f8a05f4a67c6dca3

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, [&]{