| commit | 1f299c753ec74e851e932a4aef7d21b1ca7c5828 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Sep 14 22:33:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 14 22:33:07 2023 +0000 |
| tree | e2f2c7fff4c250c0abe9b14c2f35442a285152cc | |
| parent | 089d39f69cbb96de7259b6afc81623cfc201f7bf [diff] | |
| parent | 08441a4b0eb20e577ae1c60da34319dd23054fed [diff] |
Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main am: 02b33df6b8 am: e20ecbd8a5 am: 2e61cf62f5 am: 1504e60961 am: 08441a4b0e Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751284 Change-Id: I57c711ed88613c1120f4231b1ab9b92400b3adc1 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;