commit 46a69d6dc5b01fc51b603bd15f3c1e6816ac4f5f
author Sungtak Lee <taklee@google.com> Sat Aug 12 07:24:24 2023 +0000
committer Sungtak Lee <taklee@google.com> Mon Aug 21 20:30:36 2023 +0000
tree 503ed67ff8b3e5f3fefbfdc776bde234335cccf1
parent 0a76245e59e96818bb6068d8ed68aa100e7065fc

RELAND "GraphicBufferSource: Use 64bit consumer usage"

This reverts commit 5099027f2c6034857ce41be5a30bbe8979cc2a9e.

Bug: 295498401
Bug: 185896428
Test: forrest run https://android-build.googleplex.com/builds/forrest/run/L55400000962546914
Change-Id: I43bfe65f461c8055c8213b7a017a190c3a235dfe

media/codec2/hal/client/client.cpp

diff --git a/media/codec2/hal/client/client.cpp b/media/codec2/hal/client/client.cpp
index 076a4cc..ea150b8 100644
--- a/media/codec2/hal/client/client.cpp
+++ b/media/codec2/hal/client/client.cpp
@@ -1680,8 +1680,8 @@
     uint64_t consumerUsage = kDefaultConsumerUsage;
     {
         if (surface) {
-            int usage = 0;
-            status_t err = surface->query(NATIVE_WINDOW_CONSUMER_USAGE_BITS, &usage);
+            uint64_t usage = 0;
+            status_t err = surface->getConsumerUsage(&usage);
             if (err != NO_ERROR) {
                 ALOGD("setOutputSurface -- failed to get consumer usage bits (%d/%s). ignoring",
                         err, asString(err));
@@ -1694,8 +1694,7 @@
                 // they do not exist inside of C2 scope. Any buffer usage shall be communicated
                 // through the sideband channel.
 
-                // do an unsigned conversion as bit-31 may be 1
-                consumerUsage = (uint32_t)usage | kDefaultConsumerUsage;
+                consumerUsage = usage | kDefaultConsumerUsage;
             }
         }