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

Commit 25992134 authored by Scott Randolph's avatar Scott Randolph Committed by Android (Google) Code Review
Browse files

Merge "EVS HAL with multi-buffer support via BufferDesc"

parents 269292f2 db5a598f

evs/1.0/IEvsCamera.hal

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ interface IEvsCamera { 
     * as one), and if the supply is exhausted, no further frames may be

     * delivered until a buffer is returned.

     */

    doneWithFrame(uint32_t frameId, handle bufferHandle) generates (EvsResult result);

    oneway doneWithFrame(BufferDesc buffer);



    /**

     * Stop the delivery of EVS camera frames.

evs/1.0/IEvsCameraStream.hal

+1 −1
Original line number Diff line number Diff line
@@ -32,5 +32,5 @@ interface IEvsCameraStream { 
     * must be delivered, signifying the end of the stream. No further frame

     * deliveries may happen thereafter.

     */

    oneway deliverFrame(uint32_t frameId, handle bufferHandle);

    oneway deliverFrame(BufferDesc buffer);

};

evs/1.0/IEvsDisplay.hal

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ interface IEvsDisplay { 
     * must be returned via a call to returnTargetBufferForDisplay() even if the

     * display is no longer visible.

     */

     getTargetBuffer() generates (handle bufferHandle);

     getTargetBuffer() generates (BufferDesc buffer);





    /**
@@ -76,5 +76,5 @@ interface IEvsDisplay { 
     * call. The buffer may be returned at any time and in any DisplayState, but all

     * buffers are expected to be returned before the IEvsDisplay interface is destroyed.

     */

    returnTargetBufferForDisplay(handle bufferHandle) generates (EvsResult result);

    returnTargetBufferForDisplay(BufferDesc buffer) generates (EvsResult result);

};

evs/1.0/IEvsEnumerator.hal

+10 −0
Original line number Diff line number Diff line
@@ -67,5 +67,15 @@ interface IEvsEnumerator { 
     * NOTE: All buffer must have been returned to the display before making this call.

     */

    closeDisplay(IEvsDisplay display);



    /**

     * This call requests the current state of the display

     *

     * If there is no open display, this returns DisplayState::NOT_OPEN. otherwise, it returns

     * the actual state of the active display.  This call is replicated on the IEvsEnumerator

     * interface in order to allow secondary clients to monitor the state of the EVS display

     * without acquiring exclusive ownership of the display.

     */

    getDisplayState() generates (DisplayState state);

};

evs/1.0/default/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ cc_binary { 


    shared_libs: [

        "android.hardware.evs@1.0",

        "android.hardware.graphics.allocator@2.0",

        "libui",

        "libbase",

        "libbinder",