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

Commit 7022d0cd authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "Update OutputTest due to DisplaySettings changes" into tm-dev am: 97b8968e 

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



Change-Id: If9c778731b3f0bcb86993e12c5c8bb647e7c48c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79b945cd 97b8968e

services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp

+14 −15
Original line number Original line Diff line number Diff line
@@ -3368,7 +3368,6 @@ struct OutputComposeSurfacesTest : public testing::Test { 
    static constexpr float kDefaultMaxLuminance = 0.9f;

    static constexpr float kDefaultMaxLuminance = 0.9f;

    static constexpr float kDefaultAvgLuminance = 0.7f;

    static constexpr float kDefaultAvgLuminance = 0.7f;

    static constexpr float kDefaultMinLuminance = 0.1f;

    static constexpr float kDefaultMinLuminance = 0.1f;

    static constexpr float kUnknownLuminance = -1.f;

    static constexpr float kDisplayLuminance = 400.f;

    static constexpr float kDisplayLuminance = 400.f;

    static constexpr float kClientTargetLuminanceNits = 200.f;

    static constexpr float kClientTargetLuminanceNits = 200.f;

    static constexpr float kClientTargetBrightness = 0.5f;

    static constexpr float kClientTargetBrightness = 0.5f;
@@ -3766,7 +3765,7 @@ struct OutputComposeSurfacesTest_UsesExpectedDisplaySettings : public OutputComp 
TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forHdrMixedComposition) {

TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forHdrMixedComposition) {

    verify().ifMixedCompositionIs(true)

    verify().ifMixedCompositionIs(true)

            .andIfUsesHdr(true)

            .andIfUsesHdr(true)

            .withDisplayBrightnessNits(kUnknownLuminance)

            .withDisplayBrightnessNits(kDisplayLuminance)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withRenderIntent(

            .withRenderIntent(

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)
@@ -3775,7 +3774,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forHdrMixedComposi 
                    {.physicalDisplay = kDefaultOutputDestinationClip,

                    {.physicalDisplay = kDefaultOutputDestinationClip,

                     .clip = kDefaultOutputViewport,

                     .clip = kDefaultOutputViewport,

                     .maxLuminance = kDefaultMaxLuminance,

                     .maxLuminance = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDisplayLuminance,

                     .outputDataspace = kDefaultOutputDataspace,

                     .outputDataspace = kDefaultOutputDataspace,

                     .colorTransform = kDefaultColorTransformMat,

                     .colorTransform = kDefaultColorTransformMat,

                     .deviceHandlesColorTransform = true,

                     .deviceHandlesColorTransform = true,
@@ -3820,7 +3819,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, 
       forHdrMixedCompositionWithDimmingStage) {

       forHdrMixedCompositionWithDimmingStage) {

    verify().ifMixedCompositionIs(true)

    verify().ifMixedCompositionIs(true)

            .andIfUsesHdr(true)

            .andIfUsesHdr(true)

            .withDisplayBrightnessNits(kUnknownLuminance)

            .withDisplayBrightnessNits(kDisplayLuminance)

            .withDimmingStage(

            .withDimmingStage(

                    aidl::android::hardware::graphics::composer3::DimmingStage::GAMMA_OETF)

                    aidl::android::hardware::graphics::composer3::DimmingStage::GAMMA_OETF)

            .withRenderIntent(

            .withRenderIntent(
@@ -3830,7 +3829,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, 
                    {.physicalDisplay = kDefaultOutputDestinationClip,

                    {.physicalDisplay = kDefaultOutputDestinationClip,

                     .clip = kDefaultOutputViewport,

                     .clip = kDefaultOutputViewport,

                     .maxLuminance = kDefaultMaxLuminance,

                     .maxLuminance = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDisplayLuminance,

                     .outputDataspace = kDefaultOutputDataspace,

                     .outputDataspace = kDefaultOutputDataspace,

                     .colorTransform = kDefaultColorTransformMat,

                     .colorTransform = kDefaultColorTransformMat,

                     .deviceHandlesColorTransform = true,

                     .deviceHandlesColorTransform = true,
@@ -3848,7 +3847,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, 
       forHdrMixedCompositionWithRenderIntent) {

       forHdrMixedCompositionWithRenderIntent) {

    verify().ifMixedCompositionIs(true)

    verify().ifMixedCompositionIs(true)

            .andIfUsesHdr(true)

            .andIfUsesHdr(true)

            .withDisplayBrightnessNits(kUnknownLuminance)

            .withDisplayBrightnessNits(kDisplayLuminance)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withRenderIntent(aidl::android::hardware::graphics::composer3::RenderIntent::ENHANCE)

            .withRenderIntent(aidl::android::hardware::graphics::composer3::RenderIntent::ENHANCE)

            .andIfSkipColorTransform(false)

            .andIfSkipColorTransform(false)
@@ -3856,7 +3855,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, 
                    {.physicalDisplay = kDefaultOutputDestinationClip,

                    {.physicalDisplay = kDefaultOutputDestinationClip,

                     .clip = kDefaultOutputViewport,

                     .clip = kDefaultOutputViewport,

                     .maxLuminance = kDefaultMaxLuminance,

                     .maxLuminance = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDisplayLuminance,

                     .outputDataspace = kDefaultOutputDataspace,

                     .outputDataspace = kDefaultOutputDataspace,

                     .colorTransform = kDefaultColorTransformMat,

                     .colorTransform = kDefaultColorTransformMat,

                     .deviceHandlesColorTransform = true,

                     .deviceHandlesColorTransform = true,
@@ -3873,7 +3872,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, 
TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forNonHdrMixedComposition) {

TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forNonHdrMixedComposition) {

    verify().ifMixedCompositionIs(true)

    verify().ifMixedCompositionIs(true)

            .andIfUsesHdr(false)

            .andIfUsesHdr(false)

            .withDisplayBrightnessNits(kUnknownLuminance)

            .withDisplayBrightnessNits(kDisplayLuminance)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withRenderIntent(

            .withRenderIntent(

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)
@@ -3882,7 +3881,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forNonHdrMixedComp 
                    {.physicalDisplay = kDefaultOutputDestinationClip,

                    {.physicalDisplay = kDefaultOutputDestinationClip,

                     .clip = kDefaultOutputViewport,

                     .clip = kDefaultOutputViewport,

                     .maxLuminance = kDefaultMaxLuminance,

                     .maxLuminance = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDisplayLuminance,

                     .outputDataspace = kDefaultOutputDataspace,

                     .outputDataspace = kDefaultOutputDataspace,

                     .colorTransform = kDefaultColorTransformMat,

                     .colorTransform = kDefaultColorTransformMat,

                     .deviceHandlesColorTransform = true,

                     .deviceHandlesColorTransform = true,
@@ -3899,7 +3898,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forNonHdrMixedComp 
TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forHdrOnlyClientComposition) {

TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forHdrOnlyClientComposition) {

    verify().ifMixedCompositionIs(false)

    verify().ifMixedCompositionIs(false)

            .andIfUsesHdr(true)

            .andIfUsesHdr(true)

            .withDisplayBrightnessNits(kUnknownLuminance)

            .withDisplayBrightnessNits(kDisplayLuminance)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withRenderIntent(

            .withRenderIntent(

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)
@@ -3908,7 +3907,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forHdrOnlyClientCo 
                    {.physicalDisplay = kDefaultOutputDestinationClip,

                    {.physicalDisplay = kDefaultOutputDestinationClip,

                     .clip = kDefaultOutputViewport,

                     .clip = kDefaultOutputViewport,

                     .maxLuminance = kDefaultMaxLuminance,

                     .maxLuminance = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDisplayLuminance,

                     .outputDataspace = kDefaultOutputDataspace,

                     .outputDataspace = kDefaultOutputDataspace,

                     .colorTransform = kDefaultColorTransformMat,

                     .colorTransform = kDefaultColorTransformMat,

                     .deviceHandlesColorTransform = false,

                     .deviceHandlesColorTransform = false,
@@ -3925,7 +3924,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forHdrOnlyClientCo 
TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forNonHdrOnlyClientComposition) {

TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forNonHdrOnlyClientComposition) {

    verify().ifMixedCompositionIs(false)

    verify().ifMixedCompositionIs(false)

            .andIfUsesHdr(false)

            .andIfUsesHdr(false)

            .withDisplayBrightnessNits(kUnknownLuminance)

            .withDisplayBrightnessNits(kDisplayLuminance)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withRenderIntent(

            .withRenderIntent(

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)
@@ -3934,7 +3933,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, forNonHdrOnlyClien 
                    {.physicalDisplay = kDefaultOutputDestinationClip,

                    {.physicalDisplay = kDefaultOutputDestinationClip,

                     .clip = kDefaultOutputViewport,

                     .clip = kDefaultOutputViewport,

                     .maxLuminance = kDefaultMaxLuminance,

                     .maxLuminance = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDisplayLuminance,

                     .outputDataspace = kDefaultOutputDataspace,

                     .outputDataspace = kDefaultOutputDataspace,

                     .colorTransform = kDefaultColorTransformMat,

                     .colorTransform = kDefaultColorTransformMat,

                     .deviceHandlesColorTransform = false,

                     .deviceHandlesColorTransform = false,
@@ -3952,7 +3951,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, 
       usesExpectedDisplaySettingsForHdrOnlyClientCompositionWithSkipClientTransform) {

       usesExpectedDisplaySettingsForHdrOnlyClientCompositionWithSkipClientTransform) {

    verify().ifMixedCompositionIs(false)

    verify().ifMixedCompositionIs(false)

            .andIfUsesHdr(true)

            .andIfUsesHdr(true)

            .withDisplayBrightnessNits(kUnknownLuminance)

            .withDisplayBrightnessNits(kDisplayLuminance)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withDimmingStage(aidl::android::hardware::graphics::composer3::DimmingStage::LINEAR)

            .withRenderIntent(

            .withRenderIntent(

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)

                    aidl::android::hardware::graphics::composer3::RenderIntent::COLORIMETRIC)
@@ -3961,7 +3960,7 @@ TEST_F(OutputComposeSurfacesTest_UsesExpectedDisplaySettings, 
                    {.physicalDisplay = kDefaultOutputDestinationClip,

                    {.physicalDisplay = kDefaultOutputDestinationClip,

                     .clip = kDefaultOutputViewport,

                     .clip = kDefaultOutputViewport,

                     .maxLuminance = kDefaultMaxLuminance,

                     .maxLuminance = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDefaultMaxLuminance,

                     .currentLuminanceNits = kDisplayLuminance,

                     .outputDataspace = kDefaultOutputDataspace,

                     .outputDataspace = kDefaultOutputDataspace,

                     .colorTransform = kDefaultColorTransformMat,

                     .colorTransform = kDefaultColorTransformMat,

                     .deviceHandlesColorTransform = true,

                     .deviceHandlesColorTransform = true,