Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2313c3ff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update finalUsage datatype to uint64_t." into main am: f9b4cd3d 

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



Change-Id: I130a0903350cbbe0d83f27d3261282705ff4df39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9415bf2 f9b4cd3d

media/libstagefright/SurfaceUtils.cpp

+4 −3
Original line number Diff line number Diff line
@@ -111,8 +111,9 @@ status_t setNativeWindowSizeFormatAndUsage( 
        }

    }



    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 @@ status_t setNativeWindowSizeFormatAndUsage( 
        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;

}