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

Commit c78c43a1 authored by Valerie Hau's avatar Valerie Hau
Browse files

Remove maxBufferCount 

Bug: 146345307
Test: build, boot, libgui_test
Change-Id: I10e2bf315f434722a06f812617ffe91d73dcd74b
parent 966888df

libs/gui/BLASTBufferQueue.cpp

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

        mHeight(height),

        mNextTransaction(nullptr) {

        mNextTransaction(nullptr) {

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

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

    mConsumer->setMaxBufferCount(MAX_BUFFERS);

    mProducer->setMaxDequeuedBufferCount(MAX_BUFFERS - 1);

    mConsumer->setMaxAcquiredBufferCount(MAX_ACQUIRED_BUFFERS);

    mConsumer->setMaxAcquiredBufferCount(MAX_ACQUIRED_BUFFERS);

    mBufferItemConsumer =

    mBufferItemConsumer =

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

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

libs/gui/include/gui/BLASTBufferQueue.h

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

    std::mutex mMutex;

    std::condition_variable mCallbackCV;

    std::condition_variable mCallbackCV;





    static const int MAX_BUFFERS = 3;

    static const int MAX_ACQUIRED_BUFFERS = 2;

    static const int MAX_ACQUIRED_BUFFERS = 2;





    int32_t mNumFrameAvailable GUARDED_BY(mMutex);

    int32_t mNumFrameAvailable GUARDED_BY(mMutex);

libs/gui/tests/BLASTBufferQueue_test.cpp

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

    void setUpProducer(BLASTBufferQueueHelper adapter, sp<IGraphicBufferProducer>& producer) {

        auto igbProducer = adapter.getIGraphicBufferProducer();

        auto igbProducer = adapter.getIGraphicBufferProducer();

        ASSERT_NE(nullptr, igbProducer.get());

        ASSERT_NE(nullptr, igbProducer.get());

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

        IGraphicBufferProducer::QueueBufferOutput qbOutput;

        IGraphicBufferProducer::QueueBufferOutput qbOutput;

        ASSERT_EQ(NO_ERROR,

        ASSERT_EQ(NO_ERROR,

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

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