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

Commit e3af352d authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge "[sf] HdrOutputControlTest: fix strategy arguments" into main

parents f7de85cd 5260e525

services/surfaceflinger/tests/unittests/SurfaceFlinger_HdrOutputControlTest.cpp

+7 −11
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@ 




namespace android {

namespace android {





using aidl::android::hardware::graphics::common::HdrConversionCapability;

using aidl::android::hardware::graphics::common::HdrConversionStrategy;

using GuiHdrConversionStrategyTag = gui::HdrConversionStrategy::Tag;

using GuiHdrConversionStrategyTag = gui::HdrConversionStrategy::Tag;

using gui::aidl_utils::statusTFromBinderStatus;

using gui::aidl_utils::statusTFromBinderStatus;
@@ -66,17 +64,15 @@ TEST(HdrOutputControlTest, testSetHdrConversionStrategy) { 
            sf->getHdrOutputConversionSupport(&hdrOutputConversionSupport);

            sf->getHdrOutputConversionSupport(&hdrOutputConversionSupport);

    ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(getSupportStatus));

    ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(getSupportStatus));





    std::vector<HdrConversionStrategy> strategies =

    std::vector<gui::HdrConversionStrategy> strategies = {

            {HdrConversionStrategy(std::in_place_index<static_cast<size_t>(

            gui::HdrConversionStrategy::make<GuiHdrConversionStrategyTag::passthrough>(),

                                           GuiHdrConversionStrategyTag::passthrough)>),

            gui::HdrConversionStrategy::make<GuiHdrConversionStrategyTag::autoAllowedHdrTypes>(),

             HdrConversionStrategy(std::in_place_index<static_cast<size_t>(

            gui::HdrConversionStrategy::make<GuiHdrConversionStrategyTag::forceHdrConversion>(),

                                           GuiHdrConversionStrategyTag::autoAllowedHdrTypes)>),

    };

             HdrConversionStrategy(std::in_place_index<static_cast<size_t>(

                                           GuiHdrConversionStrategyTag::forceHdrConversion)>)};

    int32_t outPreferredHdrOutputType = 0;

    int32_t outPreferredHdrOutputType = 0;





    for (HdrConversionStrategy strategy : strategies) {

    for (const gui::HdrConversionStrategy& strategy : strategies) {

        binder::Status status = sf->setHdrConversionStrategy(&strategy, &outPreferredHdrOutputType);

        binder::Status status = sf->setHdrConversionStrategy(strategy, &outPreferredHdrOutputType);





        if (hdrOutputConversionSupport) {

        if (hdrOutputConversionSupport) {

            ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(status));

            ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(status));