Skip to content

Revert "MultiAccessUnit reflector helper allocated once per Component… #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zenin1504 wants to merge 2 commits into
base: sixteen
Choose a base branch
from
Open

Revert "MultiAccessUnit reflector helper allocated once per Component… #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dea55e3
Revert "MultiAccessUnit reflector helper allocated once per Component…
HELLBOY017 Aug 2, 2025
5f90385
Merge branch 'yaap:sixteen' into sixteen
zenin1504 Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions media/codec2/hal/aidl/ComponentStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,6 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store)
mParamReflectors.push_back(paramReflector);
}
#endif
// MultiAccessUnit reflector helper is allocated once per store.
// All components in this store can reuse this reflector helper.
if (MultiAccessUnitHelper::isEnabledOnPlatform()) {
std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();
mParamReflectors.push_back(helper);
mMultiAccessUnitReflector = helper;
}

// Retrieve supported parameters from store
using namespace std::placeholders;
Expand Down Expand Up @@ -253,7 +246,8 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
c2interface,
mMultiAccessUnitReflector);
multiAccessReflector);
mParamReflectors.push_back(multiAccessReflector);
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions media/codec2/hal/aidl/include/codec2/aidl/ComponentStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ struct ComponentStore : public BnComponentStore {
std::shared_ptr<C2ComponentStore> mStore;
std::vector<std::shared_ptr<C2ParamReflector>> mParamReflectors;

// Reflector helper for MultiAccessUnitHelper
std::shared_ptr<C2ReflectorHelper> mMultiAccessUnitReflector;

std::map<C2Param::CoreIndex, std::shared_ptr<C2StructDescriptor>> mStructDescriptors;
std::set<C2Param::CoreIndex> mUnsupportedStructDescriptors;
std::set<C2String> mLoadedInterfaces;
Expand Down
12 changes: 3 additions & 9 deletions media/codec2/hal/hidl/1.0/utils/ComponentStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,6 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store)
}
#endif

// MultiAccessUnit reflector helper is allocated once per store.
// All components in this store can reuse this reflector helper.
if (MultiAccessUnitHelper::isEnabledOnPlatform()) {
std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();
mParamReflectors.push_back(helper);
mMultiAccessUnitReflector = helper;
}

// Retrieve supported parameters from store
using namespace std::placeholders;
mInit = mConfigurable->init(mParameterCache);
Expand Down Expand Up @@ -239,7 +231,9 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
c2interface,
mMultiAccessUnitReflector);
multiAccessReflector);
mParamReflectors.push_back(multiAccessReflector);

}
}
}
Expand Down
3 changes: 0 additions & 3 deletions media/codec2/hal/hidl/1.0/utils/include/codec2/hidl/1.0/ComponentStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@ struct ComponentStore : public IComponentStore {
std::shared_ptr<C2ComponentStore> mStore;
std::vector<std::shared_ptr<C2ParamReflector>> mParamReflectors;

// Reflector helper for MultiAccessUnitHelper
std::shared_ptr<C2ReflectorHelper> mMultiAccessUnitReflector;

std::map<C2Param::CoreIndex, std::shared_ptr<C2StructDescriptor>> mStructDescriptors;
std::set<C2Param::CoreIndex> mUnsupportedStructDescriptors;
std::set<C2String> mLoadedInterfaces;
Expand Down
12 changes: 3 additions & 9 deletions media/codec2/hal/hidl/1.1/utils/ComponentStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,6 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store)
}
#endif

// MultiAccessUnit reflector helper is allocated once per store.
// All components in this store can reuse this reflector helper.
if (MultiAccessUnitHelper::isEnabledOnPlatform()) {
std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();
mParamReflectors.push_back(helper);
mMultiAccessUnitReflector = helper;
}

// Retrieve supported parameters from store
using namespace std::placeholders;
mInit = mConfigurable->init(mParameterCache);
Expand Down Expand Up @@ -235,11 +227,13 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
break;
}
}

if (!isComponentSupportsLargeAudioFrame) {
std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
c2interface,
mMultiAccessUnitReflector);
multiAccessReflector);
mParamReflectors.push_back(multiAccessReflector);
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions media/codec2/hal/hidl/1.1/utils/include/codec2/hidl/1.1/ComponentStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ struct ComponentStore : public IComponentStore {
std::shared_ptr<C2ComponentStore> mStore;
std::vector<std::shared_ptr<C2ParamReflector>> mParamReflectors;

// Reflector helper for MultiAccessUnitHelper
std::shared_ptr<C2ReflectorHelper> mMultiAccessUnitReflector;

std::map<C2Param::CoreIndex, std::shared_ptr<C2StructDescriptor>> mStructDescriptors;
std::set<C2Param::CoreIndex> mUnsupportedStructDescriptors;
std::set<C2String> mLoadedInterfaces;
Expand Down
11 changes: 2 additions & 9 deletions media/codec2/hal/hidl/1.2/utils/ComponentStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,6 @@ ComponentStore::ComponentStore(const std::shared_ptr<C2ComponentStore>& store)
}
#endif

// MultiAccessUnit reflector helper is allocated once per store.
// All components in this store can reuse this reflector helper.
if (MultiAccessUnitHelper::isEnabledOnPlatform()) {
std::shared_ptr<C2ReflectorHelper> helper = std::make_shared<C2ReflectorHelper>();
mParamReflectors.push_back(helper);
mMultiAccessUnitReflector = helper;
}

// Retrieve supported parameters from store
using namespace std::placeholders;
mInit = mConfigurable->init(mParameterCache);
Expand Down Expand Up @@ -239,7 +231,8 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
c2interface,
mMultiAccessUnitReflector);
multiAccessReflector);
mParamReflectors.push_back(multiAccessReflector);
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions media/codec2/hal/hidl/1.2/utils/include/codec2/hidl/1.2/ComponentStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,6 @@ struct ComponentStore : public IComponentStore {
std::shared_ptr<C2ComponentStore> mStore;
std::vector<std::shared_ptr<C2ParamReflector>> mParamReflectors;

// Reflector helper for MultiAccessUnitHelper
std::shared_ptr<C2ReflectorHelper> mMultiAccessUnitReflector;

std::map<C2Param::CoreIndex, std::shared_ptr<C2StructDescriptor>> mStructDescriptors;
std::set<C2Param::CoreIndex> mUnsupportedStructDescriptors;
std::set<C2String> mLoadedInterfaces;
Expand Down