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

Commit 485e4c35 authored by Alec Mouri's avatar Alec Mouri
Browse files

Clean-up egl image preallocation 

Allocate EGL images in onFrameAvailable, instead of a custom
onBuffersAllocated callback. This way we reduce traffic over binder
while still performing GL work ahead of time in queueBuffer().

Bug: 130567928
Test: systrace
Change-Id: I4070e9ddbd379dac3d809d0e7edb2855fc8b7a80
parent e6f6a7c4

libs/gui/BufferQueue.cpp

+0 −7
Original line number Diff line number Diff line
@@ -59,13 +59,6 @@ void BufferQueue::ProxyConsumerListener::onFrameReplaced( 
    }

}



void BufferQueue::ProxyConsumerListener::onBufferAllocated(const BufferItem& item) {

    sp<ConsumerListener> listener(mConsumerListener.promote());

    if (listener != nullptr) {

        listener->onBufferAllocated(item);

    }

}



void BufferQueue::ProxyConsumerListener::onBuffersReleased() {

    sp<ConsumerListener> listener(mConsumerListener.promote());

    if (listener != nullptr) {

libs/gui/BufferQueueProducer.cpp

+0 −17
Original line number Diff line number Diff line
@@ -539,13 +539,6 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 
                return NO_INIT;

            }



            if (mCore->mConsumerListener != nullptr) {

                BufferItem item;

                item.mGraphicBuffer = graphicBuffer;

                item.mSlot = *outSlot;

                mCore->mConsumerListener->onBufferAllocated(item);

            }



            VALIDATE_CONSISTENCY();

        } // Autolock scope

    }
@@ -975,9 +968,6 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
        item.mGraphicBuffer.clear();

    }



    // Don't send the slot number through the callback since the consumer shouldn't need it

    item.mSlot = BufferItem::INVALID_BUFFER_SLOT;



    // Call back without the main BufferQueue lock held, but with the callback

    // lock held so we can ensure that callbacks occur in order
@@ -1433,13 +1423,6 @@ void BufferQueueProducer::allocateBuffers(uint32_t width, uint32_t height, 
                BQ_LOGV("allocateBuffers: allocated a new buffer in slot %d",

                        *slot);



                if (mCore->mConsumerListener != nullptr) {

                    BufferItem item;

                    item.mGraphicBuffer = buffers[i];

                    item.mSlot = *slot;

                    mCore->mConsumerListener->onBufferAllocated(item);

                }



                // Make sure the erase is done after all uses of the slot

                // iterator since it will be invalid after this point.

                mCore->mFreeSlots.erase(slot);

libs/gui/ConsumerBase.cpp

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ void ConsumerBase::onFrameReplaced(const BufferItem &item) { 
    }

}



void ConsumerBase::onBufferAllocated(const BufferItem& /*item*/) {}



void ConsumerBase::onBuffersReleased() {

    Mutex::Autolock lock(mMutex);

libs/gui/IConsumerListener.cpp

+1 −9
Original line number Diff line number Diff line
@@ -28,8 +28,7 @@ enum class Tag : uint32_t { 
    ON_FRAME_REPLACED,

    ON_BUFFERS_RELEASED,

    ON_SIDEBAND_STREAM_CHANGED,

    ON_BUFFER_ALLOCATED,

    LAST = ON_BUFFER_ALLOCATED,

    LAST = ON_SIDEBAND_STREAM_CHANGED,

};



} // Anonymous namespace
@@ -55,11 +54,6 @@ public: 
                                                                       item);

    }



    void onBufferAllocated(const BufferItem& item) override {

        callRemoteAsync<decltype(&IConsumerListener::onBufferAllocated)>(Tag::ON_BUFFER_ALLOCATED,

                                                                         item);

    }



    void onBuffersReleased() override {

        callRemoteAsync<decltype(&IConsumerListener::onBuffersReleased)>(Tag::ON_BUFFERS_RELEASED);

    }
@@ -95,8 +89,6 @@ status_t BnConsumerListener::onTransact(uint32_t code, const Parcel& data, Parce 
            return callLocalAsync(data, reply, &IConsumerListener::onFrameAvailable);

        case Tag::ON_FRAME_REPLACED:

            return callLocalAsync(data, reply, &IConsumerListener::onFrameReplaced);

        case Tag::ON_BUFFER_ALLOCATED:

            return callLocalAsync(data, reply, &IConsumerListener::onBufferAllocated);

        case Tag::ON_BUFFERS_RELEASED:

            return callLocalAsync(data, reply, &IConsumerListener::onBuffersReleased);

        case Tag::ON_SIDEBAND_STREAM_CHANGED:

libs/gui/include/gui/BufferQueue.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ public: 
        void onDisconnect() override;

        void onFrameAvailable(const BufferItem& item) override;

        void onFrameReplaced(const BufferItem& item) override;

        void onBufferAllocated(const BufferItem& item) override;

        void onBuffersReleased() override;

        void onSidebandStreamChanged() override;

        void addAndGetFrameTimestamps(