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

Commit 5ada2be2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove maxBufferCount"

parents 4ffb6d20 c78c43a1

libs/gui/BLASTBufferQueue.cpp

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ BLASTBufferQueue::BLASTBufferQueue(const sp<SurfaceControl>& surface, int width, 
        mHeight(height),

        mNextTransaction(nullptr) {

    BufferQueue::createBufferQueue(&mProducer, &mConsumer);

    mConsumer->setMaxBufferCount(MAX_BUFFERS);

    mProducer->setMaxDequeuedBufferCount(MAX_BUFFERS - 1);

    mConsumer->setMaxAcquiredBufferCount(MAX_ACQUIRED_BUFFERS);

    mBufferItemConsumer =

            new BufferItemConsumer(mConsumer, AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER, 1, true);

libs/gui/include/gui/BLASTBufferQueue.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ private: 
    std::mutex mMutex;

    std::condition_variable mCallbackCV;



    static const int MAX_BUFFERS = 3;

    static const int MAX_ACQUIRED_BUFFERS = 2;



    int32_t mNumFrameAvailable GUARDED_BY(mMutex);

libs/gui/tests/BLASTBufferQueue_test.cpp

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ protected: 
    void setUpProducer(BLASTBufferQueueHelper adapter, sp<IGraphicBufferProducer>& producer) {

        auto igbProducer = adapter.getIGraphicBufferProducer();

        ASSERT_NE(nullptr, igbProducer.get());

        ASSERT_EQ(NO_ERROR, igbProducer->setMaxDequeuedBufferCount(2));

        IGraphicBufferProducer::QueueBufferOutput qbOutput;

        ASSERT_EQ(NO_ERROR,

                  igbProducer->connect(new DummyProducerListener, NATIVE_WINDOW_API_CPU, false,