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

Commit b34b1633 authored by Sungtak Lee's avatar Sungtak Lee
Browse files

media.c2 : Change waitable object to be based on single fd 

Currently watiable object is based on two file descriptors created by
eventfd(). Change waitable object to be based on signle fd created by
pipe2().

Bug: 254050314
Test: m
Change-Id: I6771868a93c9bfb767c904d89a3a523e370b3e7e
parent 02b33df6

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ package android.hardware.media.c2; 
interface IGraphicBufferAllocator {

interface IGraphicBufferAllocator {

  android.hardware.media.c2.IGraphicBufferAllocator.Allocation allocate(in android.hardware.media.c2.IGraphicBufferAllocator.Description desc);

  android.hardware.media.c2.IGraphicBufferAllocator.Allocation allocate(in android.hardware.media.c2.IGraphicBufferAllocator.Description desc);

  boolean deallocate(in long id);

  boolean deallocate(in long id);

  android.hardware.media.c2.IGraphicBufferAllocator.WaitableFds getWaitableFds();

  ParcelFileDescriptor getWaitableFd();

  parcelable Allocation {

  parcelable Allocation {

    android.hardware.HardwareBuffer buffer;

    android.hardware.HardwareBuffer buffer;

    ParcelFileDescriptor fence;

    ParcelFileDescriptor fence;
@@ -47,8 +47,4 @@ interface IGraphicBufferAllocator { 
    int format;

    int format;

    long usage;

    long usage;

  }

  }

  parcelable WaitableFds {

    ParcelFileDescriptor allocEvent;

    ParcelFileDescriptor statusEvent;

  }

}
 
}

media/c2/aidl/android/hardware/media/c2/IGraphicBufferAllocator.aidl

+12 −21
Original line number Original line Diff line number Diff line
@@ -75,31 +75,22 @@ interface IGraphicBufferAllocator { 
    boolean deallocate(in long id);

    boolean deallocate(in long id);





    /**

    /**

     * Fds for waitable object events.

     * Gets a waitable file descriptor.

     *

     *

     * Fds are created by eventfd() with semaphore mode.

     * Use this method once and cache it in order not to create unnecessary duplicated fds.

     * For allocEvent, An integer counter regarding dequeuable buffer count is maintained

     *

     * by client using read()/write() to the fd. The fd can be checked whether it is

     * Two file descriptors are created by pipe2(), and the reading end will be returned

     * readable via poll(). When in readable status, the specified counter is positive

     * and shared by this method. Whenever a dequeuable buffer is ready a byte will be

     * so allocate/dequeue can happen.

     * written to the writing end. Whenever a buffer is allocated(or dequeued) a byte will

     * be read from the reading end.

     *

     *

     * For statusEvent, the client can notify further allocation is not feasible.

     * The returned file descriptor(the reading end) can be polled whether the read is ready

     * e.g.) life-cycle of the underlying allocator is ended.

     * via ::poll(). If no more allocate() can be fulfilled(by status change or etc.), the

     * writing end will be closed. In the case, POLLHUP event can be retrieved via ::poll().

     *

     *

     * C2Fence object should be implemented based on this Fds. Thus, C2Fence can return

     * C2Fence object should be implemented based on this Fd. Thus, C2Fence can return

     * either by allocation being ready or allocation being infeasible by the client status

     * either by allocation being ready or allocation being infeasible by the client status

     * change.

     * change.

     */

    parcelable WaitableFds {

        ParcelFileDescriptor allocEvent;

        ParcelFileDescriptor statusEvent;

    }



    /**

     * Gets waiable file descriptors.

     *

     * Use this method once and cache it in order not to create unnecessary duplicated fds.

     * The returned array will have two fds.

     *

     *

     * If many waitable objects based on the same fd are competing, all watiable objects will be

     * If many waitable objects based on the same fd are competing, all watiable objects will be

     * notified. After being notified, they should invoke allocate(). At least one of them can

     * notified. After being notified, they should invoke allocate(). At least one of them can
@@ -110,5 +101,5 @@ interface IGraphicBufferAllocator { 
     * @return an fd array which will be wrapped to C2Fence and will be waited for

     * @return an fd array which will be wrapped to C2Fence and will be waited for

     *     until allocating is unblocked.

     *     until allocating is unblocked.

     */

     */

    WaitableFds getWaitableFds();

    ParcelFileDescriptor getWaitableFd();

}
 
}