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

Commit 7fda4cac authored by Jim Shargo's avatar Jim Shargo Committed by Android (Google) Code Review
Browse files

Merge changes from topic "jshargo-2024-fence-cleanup" into main 

* changes:
  bqhelper: Remove support for passing GL fences into BQs
  bufferqueues: Remove support for passing GL fences into BQs
parents af457a98 53d2c2c5

media/codec2/tests/aidl/GraphicsTracker_test.cpp

+2 −4
Original line number Diff line number Diff line
@@ -92,8 +92,7 @@ struct TestConsumerListener : public android::BnConsumerListener { 
        sp<IGraphicBufferConsumer> consumer = mConsumer.promote();

        if (consumer != nullptr && consumer->acquireBuffer(&buffer, 0) == android::NO_ERROR) {

            ::usleep(kRenderDelayUs);

            consumer->releaseBuffer(buffer.mSlot, buffer.mFrameNumber,

                                    EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, buffer.mFence);

            consumer->releaseBuffer(buffer.mSlot, buffer.mFrameNumber, buffer.mFence);

        }

    }

    void onBuffersReleased() override {}
@@ -438,8 +437,7 @@ TEST_F(GraphicsTrackerTest, DropAndReleaseTest) { 
    // Consume one buffer and release

    BufferItem item;

    ASSERT_EQ(OK, mConsumer->acquireBuffer(&item, 0));

    ASSERT_EQ(OK, mConsumer->releaseBuffer(item.mSlot, item.mFrameNumber,

            EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, item.mFence));

    ASSERT_EQ(OK, mConsumer->releaseBuffer(item.mSlot, item.mFrameNumber, item.mFence));

    // Nothing to consume

    ASSERT_NE(OK, mConsumer->acquireBuffer(&item, 0));

media/libstagefright/FrameCaptureLayer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -242,8 +242,7 @@ status_t FrameCaptureLayer::releaseBuffer(const BufferItem &bi) { 
    ALOGV("releaseBuffer");

    Mutex::Autolock _lock(mLock);



    return mConsumer->releaseBuffer(bi.mSlot, bi.mFrameNumber,

            EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, bi.mFence);

    return mConsumer->releaseBuffer(bi.mSlot, bi.mFrameNumber, bi.mFence);

}



}  // namespace android

media/libstagefright/MediaCodec.cpp

+1 −2
Original line number Diff line number Diff line
@@ -755,8 +755,7 @@ public: 
                // consume buffer

                sp<IGraphicBufferConsumer> consumer = mConsumer.promote();

                if (consumer != nullptr && consumer->acquireBuffer(&buffer, 0) == NO_ERROR) {

                    consumer->releaseBuffer(buffer.mSlot, buffer.mFrameNumber,

                                            EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, buffer.mFence);

                    consumer->releaseBuffer(buffer.mSlot, buffer.mFrameNumber, buffer.mFence);

                }

            }

media/libstagefright/MediaSync.cpp

+1 −2
Original line number Diff line number Diff line
@@ -752,8 +752,7 @@ void MediaSync::returnBufferToInput_l( 
    status_t status = mInput->attachBuffer(&consumerSlot, oldBuffer);

    ALOGE_IF(status != NO_ERROR, "attaching buffer to input failed (%d)", status);

    if (status == NO_ERROR) {

        status = mInput->releaseBuffer(consumerSlot, 0 /* frameNumber */,

                EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, fence);

        status = mInput->releaseBuffer(consumerSlot, 0 /* frameNumber */, fence);

        ALOGE_IF(status != NO_ERROR, "releasing buffer to input failed (%d)", status);

    }

media/module/bqhelper/GraphicBufferSource.cpp

+2 −3
Original line number Diff line number Diff line
@@ -996,8 +996,7 @@ status_t GraphicBufferSource::acquireBuffer_l(VideoBuffer *ab) { 
                    // somehow need to propagate frame number to that queue

                    if (buffer->isCached()) {

                        --mNumOutstandingAcquires;

                        mConsumer->releaseBuffer(

                                buffer->getSlot(), frameNum, EGL_NO_DISPLAY, EGL_NO_SYNC_KHR,

                        mConsumer->releaseBuffer(buffer->getSlot(), frameNum,

                                                 buffer->getReleaseFence());

                    }

                },