Merge "media.c2 aidl: provide a waitable fd for blockpool creation" into main (a9050e3a) · Commits · e / os / android_hardware_interfaces

media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponent.aidl

+5 −1

Original line number	Diff line number	Diff line
		@@ -49,8 +49,12 @@ interface IComponent {
		long blockPoolId;
		android.hardware.media.c2.IConfigurable configurable;
		}
		parcelable C2AidlGbAllocator {
		android.hardware.media.c2.IGraphicBufferAllocator igba;
		ParcelFileDescriptor waitableFd;
		}
		union BlockPoolAllocator {
		int allocatorId;
		android.hardware.media.c2.IGraphicBufferAllocator igba;
		android.hardware.media.c2.IComponent.C2AidlGbAllocator allocator;
		}
		}

+15 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ import android.hardware.media.c2.IComponentInterface;
		import android.hardware.media.c2.IConfigurable;
		import android.hardware.media.c2.IGraphicBufferAllocator;
		import android.hardware.media.c2.WorkBundle;
		import android.os.ParcelFileDescriptor;


		/**
		* Interface for an AIDL Codec2 component.
		@@ -44,6 +46,18 @@ interface IComponent {
		IConfigurable configurable;
		}

		/**
		* C2AIDL allocator interface along with a waitable fd.
		*
		* The interface is used from a specific type of C2BlockPool to allocate
		* graphic blocks. the waitable fd is used to create a specific type of
		* C2Fence which can be used for waiting until to allocate is not blocked.
		*/
		parcelable C2AidlGbAllocator {
		IGraphicBufferAllocator igba;
		ParcelFileDescriptor waitableFd;
		}

		/**
		* Allocator for C2BlockPool.
		*
		@@ -52,7 +66,7 @@ interface IComponent {
		*/
		union BlockPoolAllocator {
		int allocatorId;
		IGraphicBufferAllocator igba;
		C2AidlGbAllocator allocator;
		}

		/**