commit 13ed94458e82368c78a17cd6c9aa23e557cde9a4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 21 20:46:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 21 20:46:22 2024 +0000
tree c7e50b30f563f64512c761828b13eaaa2de35117
parent 362aa2e6b45196e0543cc21440deb422a0a58da4
parent 3fbc26a0eba77d792a65ec71f2bdba8a1da2946a

Merge "plugin: update controlParams at takeFilters()" into main

media/codec2/hal/plugin/FilterWrapper.cpp

diff --git a/media/codec2/hal/plugin/FilterWrapper.cpp b/media/codec2/hal/plugin/FilterWrapper.cpp
index 197d6e7..b926150 100644
--- a/media/codec2/hal/plugin/FilterWrapper.cpp
+++ b/media/codec2/hal/plugin/FilterWrapper.cpp
@@ -49,11 +49,6 @@
             std::weak_ptr<FilterWrapper> filterWrapper)
         : mIntf(intf), mFilterWrapper(filterWrapper) {
         takeFilters(std::move(filters));
-        for (size_t i = 0; i < mFilters.size(); ++i) {
-            mControlParamTypes.insert(
-                    mFilters[i].desc.controlParams.begin(),
-                    mFilters[i].desc.controlParams.end());
-        }
     }
 
     ~WrappedDecoderInterface() override = default;
@@ -91,6 +86,12 @@
 
         // TODO: documentation
         mFilters = std::move(filters);
+        mControlParamTypes.clear();
+        for (size_t i = 0; i < mFilters.size(); ++i) {
+            mControlParamTypes.insert(
+                    mFilters[i].desc.controlParams.begin(),
+                    mFilters[i].desc.controlParams.end());
+        }
         mTypeToIndexForQuery.clear();
         mTypeToIndexForConfig.clear();
         for (size_t i = 0; i < mFilters.size(); ++i) {