commit 0cd4fbce95ea47d7fe0cb29e558427e5802eb19a
author Sungtak Lee <taklee@google.com> Thu Feb 02 00:59:01 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Mar 01 09:05:04 2023 +0000
tree 69f4058ae7a84022d1d06b2a4eb3cadb33e50c63
parent c6c64496d22929ee4fdffd75dbb61436a4593211

GraphicBufferSource: Use 64bit consumer usage

Bug: 185896428
Change-Id: I7319e37766f636b86b831f9a2e784f9dde684935
(cherry picked from commit dc30665ffb07fb6351594880659c5430ed27671e)
Merged-In: I7319e37766f636b86b831f9a2e784f9dde684935

media/codec2/hal/client/client.cpp

diff --git a/media/codec2/hal/client/client.cpp b/media/codec2/hal/client/client.cpp
index 7f75a91..3ecbb97 100644
--- a/media/codec2/hal/client/client.cpp
+++ b/media/codec2/hal/client/client.cpp
@@ -1669,8 +1669,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));
@@ -1683,8 +1683,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;
             }
         }