Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78d584c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I5338888ed5d2934c49ad1c7da74abb250de87418
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b14aa7cc 13ed9445

media/codec2/hal/plugin/FilterWrapper.cpp

+6 −5
Original line number Diff line number Diff line
@@ -49,11 +49,6 @@ public: 
            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 @@ public: 


        // 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) {