commit f6c41426c27ed85616a531ff25116333c7794568
author Wonsik Kim <wonsik@google.com> Thu Sep 03 11:48:41 2020 -0700
committer Wonsik Kim <wonsik@google.com> Wed Sep 16 00:02:51 2020 +0000
tree e82e04451a9c7c57108bb3842bbf9a270b01136c
parent 4fd7c513cbbb2f16cc651dc920cd4a1c0f8eea90

CCodec: don't trigger output format change after flush

Bug: 149751672
Test: atest CtsMediaTestCases:AdaptivePlaybackTest
Change-Id: If34bd5eba1498f081d613d2ebc15ff75f2a90f2f

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 73b3857..1405b97 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1331,8 +1331,6 @@
         mCallback->onError(err2, ACTION_CODE_FATAL);
         return;
     }
-    // We're not starting after flush.
-    (void)mSentConfigAfterResume.test_and_set();
     err2 = mChannel->start(inputFormat, outputFormat, buffersBoundToCodec);
     if (err2 != OK) {
         mCallback->onError(err2, ACTION_CODE_FATAL);
@@ -1580,7 +1578,6 @@
         return;
     }
 
-    mSentConfigAfterResume.clear();
     {
         Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
         const std::unique_ptr<Config> &config = *configLocked;
@@ -1797,7 +1794,7 @@
             // handle configuration changes in work done
             Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
             const std::unique_ptr<Config> &config = *configLocked;
-            bool changed = !mSentConfigAfterResume.test_and_set();
+            bool changed = false;
             Config::Watcher<C2StreamInitDataInfo::output> initData =
                 config->watch<C2StreamInitDataInfo::output>();
             if (!work->worklets.empty()