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

Commit fdf5f1b8 authored by Wonsik Kim's avatar Wonsik Kim
Browse files

codec2 hal: Codec2ConfigurableClient to take HIDL or AIDL base 

AIDL implementation is stub.

Bug: 251850069
Test: presubmit
Change-Id: I4239c654e3682ddd10e1b18413bd54816f0839b8
parent b997c531

media/codec2/hidl/client/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -43,8 +43,10 @@ cc_library { 
        "android.hardware.media.c2@1.0",

        "android.hardware.media.c2@1.0",

        "android.hardware.media.c2@1.1",

        "android.hardware.media.c2@1.1",

        "android.hardware.media.c2@1.2",

        "android.hardware.media.c2@1.2",

        "android.hardware.media.c2-V1-ndk",

        "libbase",

        "libbase",

        "libbinder",

        "libbinder",

        "libbinder_ndk",

        "libcodec2",

        "libcodec2",

        "libcodec2_hidl_client@1.0",

        "libcodec2_hidl_client@1.0",

        "libcodec2_hidl_client@1.1",

        "libcodec2_hidl_client@1.1",

media/codec2/hidl/client/client.cpp

+289 −129

File changed.

Preview size limit exceeded, changes collapsed.

media/codec2/hidl/client/include/codec2/hidl/client.h

+41 −9
Original line number Original line Diff line number Diff line
@@ -83,6 +83,13 @@ struct IComponent; 
struct IComponentStore;

struct IComponentStore;

}  // namespace android::hardware::media::c2::V1_2

}  // namespace android::hardware::media::c2::V1_2





namespace aidl::android::hardware::media::c2 {

class IComponent;

class IComponentInterface;

class IComponentStore;

class IConfigurable;

}  // namespace aidl::android::hardware::media::c2



namespace android::hardware::media::bufferpool::V2_0 {

namespace android::hardware::media::bufferpool::V2_0 {

struct IClientManager;

struct IClientManager;

}  // namespace android::hardware::media::bufferpool::V2_0

}  // namespace android::hardware::media::bufferpool::V2_0
@@ -105,7 +112,36 @@ namespace android { 
// declaration of an inner class is not possible.

// declaration of an inner class is not possible.

struct Codec2ConfigurableClient {

struct Codec2ConfigurableClient {





    typedef ::android::hardware::media::c2::V1_0::IConfigurable Base;

    typedef ::android::hardware::media::c2::V1_0::IConfigurable HidlBase;

    typedef ::aidl::android::hardware::media::c2::IConfigurable AidlBase;



    struct ImplBase {

        virtual ~ImplBase() = default;



        virtual const C2String& getName() const = 0;



        virtual c2_status_t query(

                const std::vector<C2Param*>& stackParams,

                const std::vector<C2Param::Index> &heapParamIndices,

                c2_blocking_t mayBlock,

                std::vector<std::unique_ptr<C2Param>>* const heapParams) const = 0;



        virtual c2_status_t config(

                const std::vector<C2Param*> &params,

                c2_blocking_t mayBlock,

                std::vector<std::unique_ptr<C2SettingResult>>* const failures) = 0;



        virtual c2_status_t querySupportedParams(

                std::vector<std::shared_ptr<C2ParamDescriptor>>* const params

                ) const = 0;



        virtual c2_status_t querySupportedValues(

                std::vector<C2FieldSupportedValuesQuery>& fields,

                c2_blocking_t mayBlock) const = 0;

    };



    explicit Codec2ConfigurableClient(const sp<HidlBase> &hidlBase);

    explicit Codec2ConfigurableClient(const std::shared_ptr<AidlBase> &aidlBase);





    const C2String& getName() const;

    const C2String& getName() const;
@@ -127,15 +163,11 @@ struct Codec2ConfigurableClient { 
    c2_status_t querySupportedValues(

    c2_status_t querySupportedValues(

            std::vector<C2FieldSupportedValuesQuery>& fields,

            std::vector<C2FieldSupportedValuesQuery>& fields,

            c2_blocking_t mayBlock) const;

            c2_blocking_t mayBlock) const;

private:

    struct HidlImpl;

    struct AidlImpl;





    // base cannot be null.

    const std::unique_ptr<ImplBase> mImpl;

    Codec2ConfigurableClient(const sp<Base>& base);



protected:

    sp<Base> mBase;

    C2String mName;



    friend struct Codec2Client;

};

};





struct Codec2Client : public Codec2ConfigurableClient {

struct Codec2Client : public Codec2ConfigurableClient {