| commit | e20ecbd8a53963882af70b6057c8482ffcd5946e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 14 18:57:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 14 18:57:55 2023 +0000 |
| tree | 3251bc2c4d2dd42237c4c64fdc60d860d5d6deb4 | |
| parent | 60423940fb8c7f481b038f351781822941fa8d43 [diff] | |
| parent | 02b33df6b8324c5b4d36ab88d8122f9e25a05686 [diff] |
Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main am: 02b33df6b8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751284 Change-Id: Ib0312240d25d3a4683429181949457535249657e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;