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

Commit 2fb6ef44 authored Oct 02, 2024 by Treehugger Robot Committed by Automerger Merge Worker Oct 02, 2024

Merge "Add a comment about the order of SetPreferredCodec2ComponentStore() and...

Merge "Add a comment about the order of SetPreferredCodec2ComponentStore() and ComponentStore() in the code." into main am: b10b7cf4 am: 7f176a98

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

Change-Id: I8b4dbc6e95e34962d3d76369858d780e01bd1c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 22fc5189 7f176a98

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,13 @@ struct Component;
		using ::aidl::android::hardware::media::bufferpool2::IClientManager;

		struct ComponentStore : public BnComponentStore {
		/**
		* Constructor for ComponentStore.
		*
		* IMPORTANT: SetPreferredCodec2ComponentStore() is called in the constructor.
		* Be careful about the order of SetPreferredCodec2ComponentStore() and
		* ComponentStore() in the code.
		*/
		ComponentStore(const std::shared_ptr<C2ComponentStore>& store);
		virtual ~ComponentStore();

media/codec2/hal/hidl/1.0/utils/include/codec2/hidl/1.0/ComponentStore.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,13 @@ using ::android::hardware::Void;
		using ::android::sp;

		struct ComponentStore : public IComponentStore {
		/**
		* Constructor for ComponentStore.
		*
		* IMPORTANT: SetPreferredCodec2ComponentStore() is called in the constructor.
		* Be careful about the order of SetPreferredCodec2ComponentStore() and
		* ComponentStore() in the code.
		*/
		ComponentStore(const std::shared_ptr<C2ComponentStore>& store);
		virtual ~ComponentStore();

media/codec2/hal/hidl/1.1/utils/include/codec2/hidl/1.1/ComponentStore.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,13 @@ using ::android::hardware::Void;
		using ::android::sp;

		struct ComponentStore : public IComponentStore {
		/**
		* Constructor for ComponentStore.
		*
		* IMPORTANT: SetPreferredCodec2ComponentStore() is called in the constructor.
		* Be careful about the order of SetPreferredCodec2ComponentStore() and
		* ComponentStore() in the code.
		*/
		ComponentStore(const std::shared_ptr<C2ComponentStore>& store);
		virtual ~ComponentStore();

media/codec2/hal/hidl/1.2/utils/include/codec2/hidl/1.2/ComponentStore.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,13 @@ using ::android::hardware::Void;
		using ::android::sp;

		struct ComponentStore : public IComponentStore {
		/**
		* Constructor for ComponentStore.
		*
		* IMPORTANT: SetPreferredCodec2ComponentStore() is called in the constructor.
		* Be careful about the order of SetPreferredCodec2ComponentStore() and
		* ComponentStore() in the code.
		*/
		ComponentStore(const std::shared_ptr<C2ComponentStore>& store);
		virtual ~ComponentStore();