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

Commit 8cabfc3e authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Query legacy ConfigStore for use color management API. 

Default wide color gamut dataspace to Display P3 if the display is wide color display.

BUG: 124208726
Test: atest android.uirendering.cts.testclasses.WideColorGamutTests
Change-Id: I485a3636951a0fd4c4701c97eb3632542815a7d9
parent 4f65d337

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -302,8 +302,8 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 




    mDefaultCompositionDataspace =

    mDefaultCompositionDataspace =

            static_cast<ui::Dataspace>(default_composition_dataspace(Dataspace::V0_SRGB));

            static_cast<ui::Dataspace>(default_composition_dataspace(Dataspace::V0_SRGB));

    mWideColorGamutCompositionDataspace =

    mWideColorGamutCompositionDataspace = static_cast<ui::Dataspace>(wcg_composition_dataspace(

            static_cast<ui::Dataspace>(wcg_composition_dataspace(Dataspace::V0_SRGB));

            hasWideColorDisplay ? Dataspace::DISPLAY_P3 : Dataspace::V0_SRGB));

    defaultCompositionDataspace = mDefaultCompositionDataspace;

    defaultCompositionDataspace = mDefaultCompositionDataspace;

    wideColorGamutCompositionDataspace = mWideColorGamutCompositionDataspace;

    wideColorGamutCompositionDataspace = mWideColorGamutCompositionDataspace;

    defaultCompositionPixelFormat = static_cast<ui::PixelFormat>(

    defaultCompositionPixelFormat = static_cast<ui::PixelFormat>(

services/surfaceflinger/SurfaceFlingerProperties.cpp

+2 −6
Original line number Original line Diff line number Diff line
@@ -177,15 +177,11 @@ SurfaceFlingerProperties::primary_display_orientation_values primary_display_ori 




bool use_color_management(bool defaultValue) {

bool use_color_management(bool defaultValue) {

    auto tmpuseColorManagement = SurfaceFlingerProperties::use_color_management();

    auto tmpuseColorManagement = SurfaceFlingerProperties::use_color_management();

    auto tmpHasHDRDisplay = SurfaceFlingerProperties::has_HDR_display();

    auto tmpHasHDRDisplayVal = has_HDR_display(defaultValue);

    auto tmpHasWideColorDisplay = SurfaceFlingerProperties::has_wide_color_display();

    auto tmpHasWideColorDisplayVal = has_wide_color_display(defaultValue);





    auto tmpuseColorManagementVal = tmpuseColorManagement.has_value() ? *tmpuseColorManagement :

    auto tmpuseColorManagementVal = tmpuseColorManagement.has_value() ? *tmpuseColorManagement :

        defaultValue;

        defaultValue;

    auto tmpHasHDRDisplayVal = tmpHasHDRDisplay.has_value() ? *tmpHasHDRDisplay :

        defaultValue;

    auto tmpHasWideColorDisplayVal = tmpHasWideColorDisplay.has_value() ? *tmpHasWideColorDisplay :

        defaultValue;





    return tmpuseColorManagementVal || tmpHasHDRDisplayVal || tmpHasWideColorDisplayVal;

    return tmpuseColorManagementVal || tmpHasHDRDisplayVal || tmpHasWideColorDisplayVal;

}

}