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

Commit de9572ba authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Add buffer release callback in NDK" into main

parents d653be4c 3f6b1035

native/android/libandroid.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ LIBANDROID { 
    ASurfaceTransaction_fromJava; # introduced=34

    ASurfaceTransaction_reparent; # introduced=29

    ASurfaceTransaction_setBuffer; # introduced=29

    ASurfaceTransaction_setBufferWithRelease; # introduced=36

    ASurfaceTransaction_setBufferAlpha; # introduced=29

    ASurfaceTransaction_setBufferDataSpace; # introduced=29

    ASurfaceTransaction_setBufferTransparency; # introduced=29

native/android/surface_control.cpp

+29 −0
Original line number Diff line number Diff line
@@ -416,6 +416,35 @@ void ASurfaceTransaction_setBuffer(ASurfaceTransaction* aSurfaceTransaction, 
    transaction->setBuffer(surfaceControl, graphic_buffer, fence);

}



void ASurfaceTransaction_setBufferWithRelease(

        ASurfaceTransaction* aSurfaceTransaction, ASurfaceControl* aSurfaceControl,

        AHardwareBuffer* buffer, int acquire_fence_fd, void* _Null_unspecified context,

        ASurfaceTransaction_OnBufferRelease aReleaseCallback) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    CHECK_NOT_NULL(aSurfaceControl);

    CHECK_NOT_NULL(aReleaseCallback);



    sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);

    Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);



    sp<GraphicBuffer> graphic_buffer(GraphicBuffer::fromAHardwareBuffer(buffer));



    std::optional<sp<Fence>> fence = std::nullopt;

    if (acquire_fence_fd != -1) {

        fence = new Fence(acquire_fence_fd);

    }



    ReleaseBufferCallback releaseBufferCallback =

            [context,

             aReleaseCallback](const ReleaseCallbackId&, const sp<Fence>& releaseFence,

                               std::optional<uint32_t> /* currentMaxAcquiredBufferCount */) {

                (*aReleaseCallback)(context, (releaseFence) ? releaseFence->dup() : -1);

            };



    transaction->setBuffer(surfaceControl, graphic_buffer, fence, /* frameNumber */ std::nullopt,

                           /* producerId */ 0, releaseBufferCallback);

}



void ASurfaceTransaction_setGeometry(ASurfaceTransaction* aSurfaceTransaction,

                                     ASurfaceControl* aSurfaceControl, const ARect& source,

                                     const ARect& destination, int32_t transform) {