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

Commit 131a8f45 authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Add sysprop to control HDR headroom" into udc-dev am: 954c3d6d am: 008dc4a4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22087306



Change-Id: Ib11412242ecb2af89520045b2559899746f30460
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c533e52d 008dc4a4

libs/hwui/Properties.cpp

+7 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ bool Properties::isHighEndGfx = true; 
bool Properties::isLowRam = false;

bool Properties::isSystemOrPersistent = false;



float Properties::maxHdrHeadroomOn8bit = 5.f;  // TODO: Refine this number



StretchEffectBehavior Properties::stretchEffectBehavior = StretchEffectBehavior::ShaderHWUI;



DrawingEnabled Properties::drawingEnabled = DrawingEnabled::NotInitialized;
@@ -150,6 +152,11 @@ bool Properties::load() { 


    enableWebViewOverlays = base::GetBoolProperty(PROPERTY_WEBVIEW_OVERLAYS_ENABLED, true);



    auto hdrHeadroom = (float)atof(base::GetProperty(PROPERTY_8BIT_HDR_HEADROOM, "").c_str());

    if (hdrHeadroom >= 1.f) {

        maxHdrHeadroomOn8bit = std::min(hdrHeadroom, 100.f);

    }



    // call isDrawingEnabled to force loading of the property

    isDrawingEnabled();

libs/hwui/Properties.h

+4 −0
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ enum DebugLevel { 


#define PROPERTY_MEMORY_POLICY "debug.hwui.app_memory_policy"



#define PROPERTY_8BIT_HDR_HEADROOM "debug.hwui.8bit_hdr_headroom"



///////////////////////////////////////////////////////////////////////////////

// Misc

///////////////////////////////////////////////////////////////////////////////
@@ -321,6 +323,8 @@ public: 
    static bool isLowRam;

    static bool isSystemOrPersistent;



    static float maxHdrHeadroomOn8bit;



    static StretchEffectBehavior getStretchEffectBehavior() {

        return stretchEffectBehavior;

    }

libs/hwui/renderthread/CanvasContext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ float CanvasContext::setColorMode(ColorMode mode) { 
    }

    switch (mColorMode) {

        case ColorMode::Hdr:

            return 3.f;  // TODO: Refine this number

            return Properties::maxHdrHeadroomOn8bit;

        case ColorMode::Hdr10:

            return 10.f;

        default: