| commit | 2e61cf62f58f0b2031c4bf32e95f2a83331a0565 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 14 19:54:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 14 19:54:49 2023 +0000 |
| tree | 90262a93b43de0e2b392536130bdf17434f8e5f8 | |
| parent | a7b5938d5dbf2ac253770f3dad8f771a1b15360e [diff] | |
| parent | e20ecbd8a53963882af70b6057c8482ffcd5946e [diff] |
Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main am: 02b33df6b8 am: e20ecbd8a5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751284 Change-Id: I99173ebb4eeb8152e309dafe3efb3a4888ebd648 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;