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

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

Merge "BBQ: Remove BufferFreedListener"

parents fc01e22f 728dba1f

libs/gui/BLASTBufferQueue.cpp

+0 −2
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ BLASTBufferQueue::BLASTBufferQueue(const std::string& name, bool updateDestinati 
    id++;

    mBufferItemConsumer->setName(String8(consumerName.c_str()));

    mBufferItemConsumer->setFrameAvailableListener(this);

    mBufferItemConsumer->setBufferFreedListener(this);



    ComposerServiceAIDL::getComposerService()->getMaxAcquiredBufferCount(&mMaxAcquiredBuffers);

    mBufferItemConsumer->setMaxAcquiredBufferCount(mMaxAcquiredBuffers);
@@ -1120,7 +1119,6 @@ void BLASTBufferQueue::abandon() { 
    if (mBufferItemConsumer != nullptr) {

        mBufferItemConsumer->abandon();

        mBufferItemConsumer->setFrameAvailableListener(nullptr);

        mBufferItemConsumer->setBufferFreedListener(nullptr);

    }

    mBufferItemConsumer = nullptr;

    mConsumer = nullptr;

libs/gui/include/gui/BLASTBufferQueue.h

+1 −4
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ private: 
    bool mPreviouslyConnected GUARDED_BY(mMutex);

};



class BLASTBufferQueue

    : public ConsumerBase::FrameAvailableListener, public BufferItemConsumer::BufferFreedListener

{

class BLASTBufferQueue : public ConsumerBase::FrameAvailableListener {

public:

    BLASTBufferQueue(const std::string& name, bool updateDestinationFrame = true);

    BLASTBufferQueue(const std::string& name, const sp<SurfaceControl>& surface, int width,
@@ -83,7 +81,6 @@ public: 
    sp<Surface> getSurface(bool includeSurfaceControlHandle);

    bool isSameSurfaceControl(const sp<SurfaceControl>& surfaceControl) const;



    void onBufferFreed(const wp<GraphicBuffer>&/* graphicBuffer*/) override { /* TODO */ }

    void onFrameReplaced(const BufferItem& item) override;

    void onFrameAvailable(const BufferItem& item) override;

    void onFrameDequeued(const uint64_t) override;