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

Commit a9cc80ba authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5674428 from 6c54549f to qt-qpr1-release 

Change-Id: Ifb6b16f271cf38e82357ec63549a5b39ee200a4e
parents 37a932ee 6c54549f

libs/dumputils/dump_utils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static const char* native_processes_to_dump[] = { 
static const char* hal_interfaces_to_dump[] {

        "android.hardware.audio@2.0::IDevicesFactory",

        "android.hardware.audio@4.0::IDevicesFactory",

        "android.hardware.biometrics.face@1.0::IBiometricsFace",

        "android.hardware.bluetooth@1.0::IBluetoothHci",

        "android.hardware.camera.provider@2.4::ICameraProvider",

        "android.hardware.drm@1.0::IDrmFactory",

services/surfaceflinger/RegionSamplingThread.cpp

+5 −5
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ void RegionSamplingThread::binderDied(const wp<IBinder>& who) { 


namespace {

// Using Rec. 709 primaries

float getLuma(float r, float g, float b) {

inline float getLuma(float r, float g, float b) {

    constexpr auto rec709_red_primary = 0.2126f;

    constexpr auto rec709_green_primary = 0.7152f;

    constexpr auto rec709_blue_primary = 0.0722f;
@@ -293,10 +293,10 @@ float sampleArea(const uint32_t* data, int32_t width, int32_t height, int32_t st 
        const uint32_t* rowBase = data + row * stride;

        for (int32_t column = area.left; column < area.right; ++column) {

            uint32_t pixel = rowBase[column];

            const float r = (pixel & 0xFF) / 255.0f;

            const float g = ((pixel >> 8) & 0xFF) / 255.0f;

            const float b = ((pixel >> 16) & 0xFF) / 255.0f;

            const uint8_t luma = std::round(getLuma(r, g, b) * 255.0f);

            const float r = pixel & 0xFF;

            const float g = (pixel >> 8) & 0xFF;

            const float b = (pixel >> 16) & 0xFF;

            const uint8_t luma = std::round(getLuma(r, g, b));

            ++brightnessBuckets[luma];

            if (brightnessBuckets[luma] > majoritySampleNum) return luma / 255.0f;

        }