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

Commit 66828572 authored by Dan Stoza's avatar Dan Stoza Committed by Android Git Automerger
Browse files

am 172ff24c: am 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase" 

* commit '172ff24c':
  libgui: Plumb detachBuffer through ConsumerBase
parents 3b025f13 172ff24c

include/gui/ConsumerBase.h

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ public: 
    // when a new frame becomes available.

    void setFrameAvailableListener(const wp<FrameAvailableListener>& listener);



    // See IGraphicBufferConsumer::detachBuffer

    status_t detachBuffer(int slot);



private:

    ConsumerBase(const ConsumerBase&);

    void operator=(const ConsumerBase&);

libs/gui/ConsumerBase.cpp

+15 −0
Original line number Diff line number Diff line
@@ -163,6 +163,21 @@ void ConsumerBase::setFrameAvailableListener( 
    mFrameAvailableListener = listener;

}



status_t ConsumerBase::detachBuffer(int slot) {

    CB_LOGV("detachBuffer");

    Mutex::Autolock lock(mMutex);



    status_t result = mConsumer->detachBuffer(slot);

    if (result != NO_ERROR) {

        CB_LOGE("Failed to detach buffer: %d", result);

        return result;

    }



    freeBufferLocked(slot);



    return result;

}



void ConsumerBase::dump(String8& result) const {

    dump(result, "");

}