commit 00afb8177fdbf144c75c00e9eacc915589807d35
author Dan Stoza <stoza@google.com> Tue Apr 07 22:38:00 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 07 22:38:00 2015 +0000
tree 0e7bac84fd1a5c0986f794e62957aa33e8700010
parent 1cd030be59c108cde25234f0d2da83a68a7cdd26
parent 634f5ee6a713b3cf4086a2af8e9b56e76cba245f

Merge "libgui: Plumb detachBuffer through ConsumerBase"

include/gui/ConsumerBase.h

diff --git a/include/gui/ConsumerBase.h b/include/gui/ConsumerBase.h
index ef0feab..d56fa89 100644
--- a/include/gui/ConsumerBase.h
+++ b/include/gui/ConsumerBase.h
@@ -76,6 +76,9 @@
     // 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

diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index b874e3a..e576018 100644
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@@ -163,6 +163,21 @@
     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, "");
 }