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

Commit 50b06b7f authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "codec2 hal: use SharedRefBase::ref() instead of shared_from_this" into... 

Merge "codec2 hal: use SharedRefBase::ref() instead of shared_from_this" into main am: 5675e331 am: db6cce87 am: e051247f

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



Change-Id: I2ada3caff7969e463dbd3417832a46992737db1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 691680b7 e051247f

media/codec2/hal/aidl/Component.cpp

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ void Component::initListener(const std::shared_ptr<Component>& self) { 


        mDeathRecipient = ::ndk::ScopedAIBinder_DeathRecipient(

                AIBinder_DeathRecipient_new(OnBinderDied));

        mDeathContext = new DeathContext{weak_from_this()};

        mDeathContext = new DeathContext{ref<Component>()};

        AIBinder_DeathRecipient_setOnUnlinked(mDeathRecipient.get(), OnBinderUnlinked);

        AIBinder_linkToDeath(mListener->asBinder().get(), mDeathRecipient.get(), mDeathContext);

    } else {

media/codec2/hal/aidl/ComponentStore.cpp

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ ScopedAStatus ComponentStore::createComponent( 
#endif

        onInterfaceLoaded(c2component->intf());

        std::shared_ptr<Component> comp =

            SharedRefBase::make<Component>(c2component, listener, shared_from_this(), pool);

            SharedRefBase::make<Component>(c2component, listener, ref<ComponentStore>(), pool);

        *component = comp;

        if (!component) {

            status = C2_CORRUPTED;

media/codec2/hal/aidl/include/codec2/aidl/Component.h

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ namespace utils { 


struct ComponentStore;



struct Component : public BnComponent,

                   public std::enable_shared_from_this<Component> {

struct Component : public BnComponent {

    Component(

            const std::shared_ptr<C2Component>&,

            const std::shared_ptr<IComponentListener>& listener,

media/codec2/hal/aidl/include/codec2/aidl/ComponentStore.h

+1 −2
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ struct Component; 


using ::aidl::android::hardware::media::bufferpool2::IClientManager;



struct ComponentStore : public BnComponentStore,

                        public std::enable_shared_from_this<ComponentStore> {

struct ComponentStore : public BnComponentStore {

    ComponentStore(const std::shared_ptr<C2ComponentStore>& store);

    virtual ~ComponentStore();