Merge "RE-RELAND "codec2 hal: Codec2ConfigurableClient to take HIDL or AIDL... (795cb423) · Commits · e / os / android_frameworks_av

media/codec2/hal/client/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ cc_library {
		"android.hardware.media.c2@1.0",
		"android.hardware.media.c2@1.1",
		"android.hardware.media.c2@1.2",
		"android.hardware.media.c2-V1-ndk",
		"libbase",
		"libbinder",
		"libbinder_ndk",

media/codec2/hal/client/client.cpp

+287 −127

File changed.

Preview size limit exceeded, changes collapsed.

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

+41 −9

Original line number	Diff line number	Diff line
		@@ -84,6 +84,13 @@ struct IComponent;
		struct IComponentStore;
		} // 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 {
		struct IClientManager;
		} // namespace android::hardware::media::bufferpool::V2_0
		@@ -106,7 +113,36 @@ namespace android {
		// declaration of an inner class is not possible.
		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;

		@@ -128,15 +164,11 @@ struct Codec2ConfigurableClient {
		c2_status_t querySupportedValues(
		std::vector<C2FieldSupportedValuesQuery>& fields,
		c2_blocking_t mayBlock) const;
		private:
		struct HidlImpl;
		struct AidlImpl;

		// base cannot be null.
		Codec2ConfigurableClient(const sp<Base>& base);

		protected:
		sp<Base> mBase;
		C2String mName;

		friend struct Codec2Client;
		const std::unique_ptr<ImplBase> mImpl;
		};

		struct Codec2Client : public Codec2ConfigurableClient {