From a81bc4975941bff8dbfcb858627dfcd01250c1ed Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@google.com>
Date: Mon, 27 Nov 2017 10:16:00 -0800
Subject: libgui: add more IGBC wrappers to ConsumerBase

Add

  ConsumerBase::setName
  ConsumerBase::setConsumerUsageBits
  ConsumerBase::setTransformHint
  ConsumerBase::setMaxAcquiredBufferCount
  ConsumerBase::getSidebandStream

and remove

  BufferItemConsumer::setName
  CpuConsumer::setName
  GLConsumer::setName
  GLConsumer::setDefaultBufferFormat
  GLConsumer::setDefaultBufferDataSpace
  GLConsumer::setTransformHint
  GLConsumer::setMaxAcquiredBufferCount
  SurfaceFlingerConsumer::getSidebandStream

at the same time.

Test: libgui_test
Change-Id: I0b81b7759d6d5a7a89eefdfe95440b262e7fa424
---
 libs/gui/BufferItemConsumer.cpp | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'libs/gui/BufferItemConsumer.cpp')

diff --git a/libs/gui/BufferItemConsumer.cpp b/libs/gui/BufferItemConsumer.cpp
index da4295609b..34e6d80061 100644
--- a/libs/gui/BufferItemConsumer.cpp
+++ b/libs/gui/BufferItemConsumer.cpp
@@ -49,16 +49,6 @@ BufferItemConsumer::BufferItemConsumer(
 
 BufferItemConsumer::~BufferItemConsumer() {}
 
-void BufferItemConsumer::setName(const String8& name) {
-    Mutex::Autolock _l(mMutex);
-    if (mAbandoned) {
-        BI_LOGE("setName: BufferItemConsumer is abandoned!");
-        return;
-    }
-    mName = name;
-    mConsumer->setConsumerName(name);
-}
-
 void BufferItemConsumer::setBufferFreedListener(
         const wp<BufferFreedListener>& listener) {
     Mutex::Autolock _l(mMutex);
-- 
cgit v1.2.3-59-g8ed1b


From 82607f30c8a71b6854ca26307e5ab18542eb3952 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 27 Apr 2018 17:01:45 -0700
Subject: Fix BufferItemConsumer::releaseBuffer error logging

STALE_BUFFER_SLOT is a hint, not an error, and shouldn't
be logged.

Fixes: 77483431
Test: verified
CtsUiRenderingTestCases:.testclasses.HardwareBitmapTests#testCreateFromPicture
doesn't log any errors to logcat

Change-Id: I570c585b7c55c668d994bf37854a2252b09b9da8
---
 libs/gui/BufferItemConsumer.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libs/gui/BufferItemConsumer.cpp')

diff --git a/libs/gui/BufferItemConsumer.cpp b/libs/gui/BufferItemConsumer.cpp
index 34e6d80061..89bc0c4c2d 100644
--- a/libs/gui/BufferItemConsumer.cpp
+++ b/libs/gui/BufferItemConsumer.cpp
@@ -92,10 +92,13 @@ status_t BufferItemConsumer::releaseBuffer(const BufferItem &item,
     Mutex::Autolock _l(mMutex);
 
     err = addReleaseFenceLocked(item.mSlot, item.mGraphicBuffer, releaseFence);
+    if (err != OK) {
+        BI_LOGE("Failed to addReleaseFenceLocked");
+    }
 
     err = releaseBufferLocked(item.mSlot, item.mGraphicBuffer, EGL_NO_DISPLAY,
             EGL_NO_SYNC_KHR);
-    if (err != OK) {
+    if (err != OK && err != IGraphicBufferConsumer::STALE_BUFFER_SLOT) {
         BI_LOGE("Failed to release buffer: %s (%d)",
                 strerror(-err), err);
     }
-- 
cgit v1.2.3-59-g8ed1b