commit 924454f555f0cf3fbef2b5139d398de0e2568567
author Chia-I Wu <olv@google.com> Thu Nov 16 14:30:28 2017 -0800
committer Chia-I Wu <olv@google.com> Fri Dec 08 14:08:16 2017 -0800
tree d5569fbe53b5bb873000d0a58d30b29be6095e72
parent 96ad8222f300c4dd918a15192a8a9c1c4c6fd834

libgui: fix and clean up CpuConsumer::unlockBuffer

addReleaseFenceLocked should be called with
AcquiredBuffer::mGraphicBuffer, not the one in ConsumerBase::mSlots.
Otherwise, it breaks ConsumerBase::stillTracking.

Also thanks to stillTracking, we don't need to do the tracking
manually.

Test: libgui_test
Change-Id: Ib69b88263c4619634ae2977b9f811be5a846f446

libs/gui/CpuConsumer.cpp

diff --git a/libs/gui/CpuConsumer.cpp b/libs/gui/CpuConsumer.cpp
index e5e02b4..5bda5f8 100644
--- a/libs/gui/CpuConsumer.cpp
+++ b/libs/gui/CpuConsumer.cpp
@@ -18,7 +18,6 @@
 #define LOG_TAG "CpuConsumer"
 //#define ATRACE_TAG ATRACE_TAG_GRAPHICS
 
-#include <cutils/compiler.h>
 #include <utils/Log.h>
 #include <gui/BufferItem.h>
 #include <gui/CpuConsumer.h>
@@ -222,42 +221,24 @@
         return BAD_VALUE;
     }
 
-    return releaseAcquiredBufferLocked(lockedIdx);
-}
+    AcquiredBuffer& ab = mAcquiredBuffers.editItemAt(lockedIdx);
 
-status_t CpuConsumer::releaseAcquiredBufferLocked(size_t lockedIdx) {
-    status_t err;
-    int fd = -1;
-
-    err = mAcquiredBuffers[lockedIdx].mGraphicBuffer->unlockAsync(&fd);
+    int fenceFd = -1;
+    status_t err = ab.mGraphicBuffer->unlockAsync(&fenceFd);
     if (err != OK) {
         CC_LOGE("%s: Unable to unlock graphic buffer %zd", __FUNCTION__,
                 lockedIdx);
         return err;
     }
-    int buf = mAcquiredBuffers[lockedIdx].mSlot;
-    if (CC_LIKELY(fd != -1)) {
-        sp<Fence> fence(new Fence(fd));
-        addReleaseFenceLocked(
-            mAcquiredBuffers[lockedIdx].mSlot,
-            mSlots[buf].mGraphicBuffer,
-            fence);
-    }
 
-    // release the buffer if it hasn't already been freed by the BufferQueue.
-    // This can happen, for example, when the producer of this buffer
-    // disconnected after this buffer was acquired.
-    if (CC_LIKELY(mAcquiredBuffers[lockedIdx].mGraphicBuffer ==
-            mSlots[buf].mGraphicBuffer)) {
-        releaseBufferLocked(
-                buf, mAcquiredBuffers[lockedIdx].mGraphicBuffer,
-                EGL_NO_DISPLAY, EGL_NO_SYNC_KHR);
-    }
+    sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : Fence::NO_FENCE);
+    addReleaseFenceLocked(ab.mSlot, ab.mGraphicBuffer, fence);
+    releaseBufferLocked(ab.mSlot, ab.mGraphicBuffer);
 
-    AcquiredBuffer &ab = mAcquiredBuffers.editItemAt(lockedIdx);
     ab.reset();
 
     mCurrentLockedBuffers--;
+
     return OK;
 }