commit f9b4cd3da8bb8206b11f8eeed88b68a44e4be7b4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu May 02 20:39:48 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 02 20:39:48 2024 +0000
tree b4668ebebe851071110f0e1c07b467e9cf48607e
parent fac62be68a2802fc7a67bacff0ecec8212afa8d4
parent 6a6850ef2d4bd98dd318910778c96d80598621a0

Merge "Update finalUsage datatype to uint64_t." into main

media/libstagefright/SurfaceUtils.cpp

diff --git a/media/libstagefright/SurfaceUtils.cpp b/media/libstagefright/SurfaceUtils.cpp
index 604dcb0..714e312 100644
--- a/media/libstagefright/SurfaceUtils.cpp
+++ b/media/libstagefright/SurfaceUtils.cpp
@@ -111,8 +111,9 @@
         }
     }
 
-    int finalUsage = usage | consumerUsage;
-    ALOGV("gralloc usage: %#x(producer) + %#x(consumer) = %#x", usage, consumerUsage, finalUsage);
+    uint64_t finalUsage = (uint32_t) usage | (uint32_t) consumerUsage;
+    ALOGV("gralloc usage: %#x(producer) + %#x(consumer) = 0x%" PRIx64,
+            usage, consumerUsage, finalUsage);
     err = native_window_set_usage(nativeWindow, finalUsage);
     if (err != NO_ERROR) {
         ALOGE("native_window_set_usage failed: %s (%d)", strerror(-err), -err);
@@ -126,7 +127,7 @@
         return err;
     }
 
-    ALOGD("set up nativeWindow %p for %dx%d, color %#x, rotation %d, usage %#x",
+    ALOGD("set up nativeWindow %p for %dx%d, color %#x, rotation %d, usage 0x%" PRIx64,
             nativeWindow, width, height, format, rotation, finalUsage);
     return NO_ERROR;
 }