commit 98dc43e9fa7cc830e5061b491635fc3cf1b6c844
author Sungtak Lee <taklee@google.com> Wed Mar 24 05:21:06 2021 -0700
committer Sungtak Lee <taklee@google.com> Wed Mar 24 05:21:06 2021 -0700
tree 4c242530a65f50f6f81b21833f58fe69f2351a10
parent c9d4c97e04eb5ecc371833ad5f981b5d7188bfac

C2VdaBqBlockPool: refelcts C2BufferQueueBlockPool change

C2BufferQueueBlockPool implementation changed for supporting waitable
object. Reflects the change.

Bug: 157111613
Change-Id: I4cfc14221bd95e962774df63573eb216f234b462

plugin_store/C2VdaBqBlockPool.cpp

diff --git a/plugin_store/C2VdaBqBlockPool.cpp b/plugin_store/C2VdaBqBlockPool.cpp
index 8ad8a0f..855f389 100644
--- a/plugin_store/C2VdaBqBlockPool.cpp
+++ b/plugin_store/C2VdaBqBlockPool.cpp
@@ -18,6 +18,7 @@
 
 #include <C2AllocatorGralloc.h>
 #include <C2BlockInternal.h>
+#include <C2SurfaceSyncObj.h>
 #include <android/hardware/graphics/bufferqueue/2.0/IProducerListener.h>
 #include <base/callback.h>
 #include <log/log.h>
@@ -244,10 +245,12 @@
 
             unique_id_t uniqueId;
             sp<GraphicBuffer> slotBuffer;
+            std::shared_ptr<C2SurfaceSyncMemory> syncMem;
             std::tie(uniqueId, slotBuffer) = getSlotBuffer(oldSlot);
             slot_t newSlot = poolData->migrate(producer->getBase(), mGenerationToBeMigrated,
                                                mUsageToBeMigrated, producerId, slotBuffer,
-                                               slotBuffer->getGenerationNumber());
+                                               slotBuffer->getGenerationNumber(),
+                                               syncMem);
             if (newSlot < 0) {
                 ALOGW("%s() Failed to migrate local buffer: uniqueId=%u, oldSlot=%d", __func__,
                       uniqueId, oldSlot);
@@ -604,10 +607,12 @@
         }
     }
 
+    std::shared_ptr<C2SurfaceSyncMemory> syncMem;
     std::shared_ptr<C2GraphicAllocation> allocation =
             mTrackedGraphicBuffers.getRegisteredAllocation(uniqueId);
     auto poolData = std::make_shared<C2BufferQueueBlockPoolData>(
-            slotBuffer->getGenerationNumber(), mProducerId, slot, mProducer->getBase());
+            slotBuffer->getGenerationNumber(), mProducerId, slot,
+            mProducer->getBase(), syncMem, 0);
     mTrackedGraphicBuffers.updatePoolData(slot, poolData);
     *block = _C2BlockFactory::CreateGraphicBlock(std::move(allocation), std::move(poolData));
     if (*block == nullptr) {