From 22c2ea079ba6580a93292e10946034bf64a92bfe Mon Sep 17 00:00:00 2001
From: Sungtak Lee <taklee@google.com>
Date: Thu, 14 Sep 2023 02:23:17 +0000
Subject: [PATCH] media.c2: Enable BaseBlock to parcel AHardwareBuffer

Enable c2 interface to send/receive AHardwareBuffer.

Test: m
Bug: 254050314
Change-Id: I3289d891fb0eae49652e3e88b77070f6762fc5b1
---
 .../current/android/hardware/media/c2/BaseBlock.aidl         | 1 +
 media/c2/aidl/android/hardware/media/c2/BaseBlock.aidl       | 5 +++++
 2 files changed, 6 insertions(+)

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 460ff97522..069b2cf244 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 @@ package android.hardware.media.c2;
 @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 8b8b8e0e46..7cc041c1ce 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;
 
 /**
@@ -31,6 +32,10 @@ union BaseBlock {
      * #nativeBlock is the opaque representation of a buffer.
      */
     NativeHandle nativeBlock;
+    /**
+     * #hwbBlock is the opaque representation of a GraphicBuffer
+     */
+    HardwareBuffer hwbBlock;
     /**
      * #pooledBlock is a reference to a buffer handled by a BufferPool.
      */