Revert "GraphicBufferSource: Use 64bit consumer usage"
This reverts commit b6caaf8dd20f4e79ccf74b6ac65ed2e52b70d4e5.
Reason for revert: b/295498401- AOSP phones not booting
Passing with revert: go/forrest-run/L01600000962534617
Change-Id: I856c6e303cad907c05e522bcd76672b2104ee19f
diff --git a/media/codec2/hal/client/client.cpp b/media/codec2/hal/client/client.cpp
index 0bf96cf..01fc593 100644
--- a/media/codec2/hal/client/client.cpp
+++ b/media/codec2/hal/client/client.cpp
@@ -1683,8 +1683,8 @@
uint64_t consumerUsage = kDefaultConsumerUsage;
{
if (surface) {
- uint64_t usage = 0;
- status_t err = surface->getConsumerUsage(&usage);
+ int usage = 0;
+ status_t err = surface->query(NATIVE_WINDOW_CONSUMER_USAGE_BITS, &usage);
if (err != NO_ERROR) {
ALOGD("setOutputSurface -- failed to get consumer usage bits (%d/%s). ignoring",
err, asString(err));
@@ -1697,7 +1697,8 @@
// they do not exist inside of C2 scope. Any buffer usage shall be communicated
// through the sideband channel.
- consumerUsage = usage | kDefaultConsumerUsage;
+ // do an unsigned conversion as bit-31 may be 1
+ consumerUsage = (uint32_t)usage | kDefaultConsumerUsage;
}
}