commit 594b96442eac9dafbccfc49c2876b47410e8cb46
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jan 06 00:21:23 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jan 06 00:21:23 2023 +0000
tree deed63fd9dd4feddd171dd71d01e29f07c245fa9
parent 346a2e6901ee4d740c2a07523cf05022d004c585
parent bae7e457c296aa8a64826aa355e784a78419d521

Snap for 9459725 from bae7e457c296aa8a64826aa355e784a78419d521 to tm-qpr2-release

Change-Id: I1bdc0d7f930db1c339931355408215a68929b26e

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.