commit bae7e457c296aa8a64826aa355e784a78419d521
author Sungtak Lee <taklee@google.com> Tue Sep 20 09:48:52 2022 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Jan 04 04:48:00 2023 +0000
tree deed63fd9dd4feddd171dd71d01e29f07c245fa9
parent 143627b222fe1c06bacd22ec5fb7d8985c7f7341

C2BqBuffer: Clear a cached buffer if reallocation is needed

If a cached buffer is required to be reallocated, clear the buffer in
the cache.
Bug: 240393739
Change-Id: I6db4a66039f0455c566e2ab009effc4a5b7f37be
(cherry picked from commit 0e212e87bd0eaf4beb6c2c2765d7760e55d5f7eb)
Merged-In: I6db4a66039f0455c566e2ab009effc4a5b7f37be

media/codec2/vndk/platform/C2BqBuffer.cpp

diff --git a/media/codec2/vndk/platform/C2BqBuffer.cpp b/media/codec2/vndk/platform/C2BqBuffer.cpp
index 270bbf4..f2cd585 100644
--- a/media/codec2/vndk/platform/C2BqBuffer.cpp
+++ b/media/codec2/vndk/platform/C2BqBuffer.cpp
@@ -432,6 +432,10 @@
         if (fence) {
             static constexpr int kFenceWaitTimeMs = 10;
 
+            if (bufferNeedsReallocation) {
+                mBuffers[slot].clear();
+            }
+
             status_t status = fence->wait(kFenceWaitTimeMs);
             if (status == -ETIME) {
                 // fence is not signalled yet.