Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5edd8f2b authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

media.bufferpool2: support AHardwareBuffer based buffer am: 71ef1c15 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2907297



Change-Id: I1666691fcf42a78a9ea6065351fe1c839c3343f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 975a0006 71ef1c15

media/bufferpool/aidl/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ aidl_interface { 
    vendor_available: true,

    double_loadable: true,

    srcs: ["android/hardware/media/bufferpool2/*.aidl"],

    headers: [

        "HardwareBuffer_aidl",

    ],

    imports: [

        "android.hardware.common-V2",

        "android.hardware.common.fmq-V1",
@@ -44,10 +47,13 @@ aidl_interface { 
                "//apex_available:platform",

                "com.android.media.swcodec",

            ],

            additional_shared_libraries: [

                "libnativewindow",

            ],

            min_sdk_version: "29",

        },

        rust: {

            enabled: true,

            enabled: false,

        },

    },

    versions_with_info: [
@@ -59,6 +65,6 @@ aidl_interface { 
            ],

        },

    ],

    frozen: true,

    frozen: false,



}

media/bufferpool/aidl/aidl_api/android.hardware.media.bufferpool2/current/android/hardware/media/bufferpool2/Buffer.aidl

+2 −1
Original line number Diff line number Diff line
@@ -35,5 +35,6 @@ package android.hardware.media.bufferpool2; 
@VintfStability

parcelable Buffer {

  int id;

  android.hardware.common.NativeHandle buffer;

  @nullable android.hardware.common.NativeHandle buffer;

  @nullable android.hardware.HardwareBuffer hwbBuffer;

}

media/bufferpool/aidl/android/hardware/media/bufferpool2/Buffer.aidl

+6 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.media.bufferpool2;



import android.hardware.common.NativeHandle;

import android.hardware.HardwareBuffer;



/**

 * Generic buffer for fast recycling for media/stagefright.
@@ -26,10 +27,14 @@ import android.hardware.common.NativeHandle; 
 * by a buffer pool, and are recycled to the buffer pool when they are

 * no longer referenced by the clients.

 *

 * Initially all buffers in media HAL should be NativeHandle(actually native_handle_t).

 * HardwareBuffer(actually AHardwareBuffer) for GraphicBuffer is added from V2.

 *

 * E.g. ion or gralloc buffer

 */

@VintfStability

parcelable Buffer {

    int id;

    NativeHandle buffer;

    @nullable NativeHandle buffer;

    @nullable HardwareBuffer hwbBuffer;

}