| commit | 02b33df6b8324c5b4d36ab88d8122f9e25a05686 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 14 18:16:02 2023 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Sep 14 18:16:02 2023 +0000 |
| tree | 990042041bb8d00009237c2242f6a493ce975b4b | |
| parent | 38a85e778c7e4516dde14840ab69692e671c5af5 [diff] | |
| parent | 22c2ea079ba6580a93292e10946034bf64a92bfe [diff] |
Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main
diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/BaseBlock.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/BaseBlock.aidl index 460ff97..069b2cf 100644 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/BaseBlock.aidl +++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/BaseBlock.aidl
@@ -35,5 +35,6 @@ @VintfStability union BaseBlock { android.hardware.common.NativeHandle nativeBlock; + android.hardware.HardwareBuffer hwbBlock; android.hardware.media.bufferpool2.BufferStatusMessage pooledBlock; }
diff --git a/media/c2/aidl/android/hardware/media/c2/BaseBlock.aidl b/media/c2/aidl/android/hardware/media/c2/BaseBlock.aidl index 8b8b8e0..7cc041c 100644 --- a/media/c2/aidl/android/hardware/media/c2/BaseBlock.aidl +++ b/media/c2/aidl/android/hardware/media/c2/BaseBlock.aidl
@@ -16,6 +16,7 @@ package android.hardware.media.c2; +import android.hardware.HardwareBuffer; import android.hardware.common.NativeHandle; /** @@ -32,6 +33,10 @@ */ NativeHandle nativeBlock; /** + * #hwbBlock is the opaque representation of a GraphicBuffer + */ + HardwareBuffer hwbBlock; + /** * #pooledBlock is a reference to a buffer handled by a BufferPool. */ android.hardware.media.bufferpool2.BufferStatusMessage pooledBlock;