commit a476f2ce8be0f6f48fe817c839277f5eeac37dcc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 14 01:22:33 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 14 01:22:33 2024 +0000
tree 66492a1876c131eb8f72d8a68aef584ed3dd90ad
parent c8145ed93a5113307aa5f1c0036ef70bfe18405e
parent 1cf68fcb91b74172f29eb80bd62ed0c90dc29758

Merge "C2BqBuffer: fix to check consumer usage when migrating during surface change" into main am: 35672ce509 am: 1cf68fcb91

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3343540

Change-Id: Ia566a8191d4ca7318bdd859cd3d7e59814253b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/codec2/vndk/platform/C2BqBuffer.cpp

diff --git a/media/codec2/vndk/platform/C2BqBuffer.cpp b/media/codec2/vndk/platform/C2BqBuffer.cpp
index 665f9fc..17dfe9c 100644
--- a/media/codec2/vndk/platform/C2BqBuffer.cpp
+++ b/media/codec2/vndk/platform/C2BqBuffer.cpp
@@ -997,7 +997,7 @@
         return -1;
     }
 
-    if (toUsage != graphicBuffer->getUsage()) {
+    if ((toUsage & graphicBuffer->getUsage()) != toUsage) {
         sp<GraphicBuffer> newBuffer = new GraphicBuffer(
             graphicBuffer->handle, GraphicBuffer::CLONE_HANDLE,
             graphicBuffer->width, graphicBuffer->height, graphicBuffer->format,