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

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

Merge "codec2 components: fix subscribed indices setter" am: f234ad18 

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



Change-Id: I2dde5769a72c1c8c234f3b99848f83da6dd1c952
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6637aeb f234ad18

media/codec2/components/base/SimpleC2Interface.cpp

+9 −1
Original line number Diff line number Diff line
@@ -28,6 +28,14 @@ namespace android { 


/* SimpleInterface */



static C2R SubscribedParamIndicesSetter(

        bool mayBlock, C2InterfaceHelper::C2P<C2SubscribedParamIndicesTuning> &me) {

    (void)mayBlock;

    (void)me;



    return C2R::Ok();

}



SimpleInterface<void>::BaseParams::BaseParams(

        const std::shared_ptr<C2ReflectorHelper> &reflector,

        C2String name,
@@ -186,7 +194,7 @@ SimpleInterface<void>::BaseParams::BaseParams( 
            .withDefault(C2SubscribedParamIndicesTuning::AllocShared(0u))

            .withFields({ C2F(mSubscribedParamIndices, m.values[0]).any(),

                          C2F(mSubscribedParamIndices, m.values).any() })

            .withSetter(Setter<C2SubscribedParamIndicesTuning>::NonStrictValuesWithNoDeps)

            .withSetter(SubscribedParamIndicesSetter)

            .build());



    /* TODO

media/codec2/components/base/include/SimpleC2Interface.h

+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ struct Setter { 
        return me.F(me.v.value).validatePossible(me.v.value);

    }



    // TODO(b/230146771): fix crash

    static C2R NonStrictValuesWithNoDeps(

            bool mayBlock, C2InterfaceHelper::C2P<type> &me) {

        (void)mayBlock;