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

Commit 96ca1066 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "media.c2 aidl: provide a waitable fd for blockpool creation" into main am: a9050e3a 

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



Change-Id: Ifd4612a752977a925179f496166b477d62eb2899
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12ef61d5 a9050e3a

media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IComponent.aidl

+5 −1
Original line number Diff line number Diff line
@@ -49,8 +49,12 @@ interface IComponent { 
    long blockPoolId;

    android.hardware.media.c2.IConfigurable configurable;

  }

  parcelable C2AidlGbAllocator {

    android.hardware.media.c2.IGraphicBufferAllocator igba;

    ParcelFileDescriptor waitableFd;

  }

  union BlockPoolAllocator {

    int allocatorId;

    android.hardware.media.c2.IGraphicBufferAllocator igba;

    android.hardware.media.c2.IComponent.C2AidlGbAllocator allocator;

  }

}

media/c2/aidl/android/hardware/media/c2/IComponent.aidl

+15 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.hardware.media.c2.IComponentInterface; 
import android.hardware.media.c2.IConfigurable;

import android.hardware.media.c2.IGraphicBufferAllocator;

import android.hardware.media.c2.WorkBundle;

import android.os.ParcelFileDescriptor;





/**

 * Interface for an AIDL Codec2 component.
@@ -44,6 +46,18 @@ interface IComponent { 
        IConfigurable configurable;

    }



    /**

     * C2AIDL allocator interface along with a waitable fd.

     *

     * The interface is used from a specific type of C2BlockPool to allocate

     * graphic blocks. the waitable fd is used to create a specific type of

     * C2Fence which can be used for waiting until to allocate is not blocked.

     */

    parcelable C2AidlGbAllocator {

        IGraphicBufferAllocator igba;

        ParcelFileDescriptor waitableFd;

    }



    /**

     * Allocator for C2BlockPool.

     *
@@ -52,7 +66,7 @@ interface IComponent { 
     */

    union BlockPoolAllocator {

        int allocatorId;

        IGraphicBufferAllocator igba;

        C2AidlGbAllocator allocator;

    }



    /**