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

Commit d182d815 authored by Marc Kassis's avatar Marc Kassis Committed by Automerger Merge Worker
Browse files

Merge "Add SurfaceFlinger tests for HDR Output Control." into udc-dev am: d0998529 

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



Change-Id: I76ccd4616654ea1bdb839d6fa3e2a2035f666aee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5855f23b d0998529

services/surfaceflinger/tests/unittests/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,9 @@ cc_test { 
        "SurfaceFlinger_DestroyDisplayTest.cpp",

        "SurfaceFlinger_DisplayModeSwitching.cpp",

        "SurfaceFlinger_DisplayTransactionCommitTest.cpp",

        "SurfaceFlinger_ExcludeDolbyVisionTest.cpp",

        "SurfaceFlinger_GetDisplayNativePrimariesTest.cpp",

        "SurfaceFlinger_HdrOutputControlTest.cpp",

        "SurfaceFlinger_HotplugTest.cpp",

        "SurfaceFlinger_MultiDisplayLeaderTest.cpp",

        "SurfaceFlinger_NotifyPowerBoostTest.cpp",
@@ -113,7 +115,6 @@ cc_test { 
        "SurfaceFlinger_SetPowerModeInternalTest.cpp",

        "SurfaceFlinger_SetupNewDisplayDeviceInternalTest.cpp",

        "SurfaceFlinger_UpdateLayerMetadataSnapshotTest.cpp",

        "SurfaceFlinger_ExcludeDolbyVisionTest.cpp",

        "SchedulerTest.cpp",

        "SetFrameRateTest.cpp",

        "RefreshRateSelectorTest.cpp",

services/surfaceflinger/tests/unittests/SurfaceFlinger_HdrOutputControlTest.cpp

0 → 100644
+89 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#undef LOG_TAG

#define LOG_TAG "LibSurfaceFlingerUnittests"



#include <gtest/gtest.h>

#include <gui/AidlStatusUtil.h>

#include <private/gui/ComposerService.h>

#include <private/gui/ComposerServiceAIDL.h>



#include "DisplayTransactionTestHelpers.h"



namespace android {



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

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

using GuiHdrConversionStrategyTag = gui::HdrConversionStrategy::Tag;

using gui::aidl_utils::statusTFromBinderStatus;



TEST(HdrOutputControlTest, testGetHdrOutputConversionSupport) {

    sp<gui::ISurfaceComposer> sf(ComposerServiceAIDL::getComposerService());



    bool hdrOutputConversionSupport;

    binder::Status status = sf->getHdrOutputConversionSupport(&hdrOutputConversionSupport);



    ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(status));

}



TEST(HdrOutputControlTest, testGetHdrConversionCapabilities) {

    sp<gui::ISurfaceComposer> sf(ComposerServiceAIDL::getComposerService());



    bool hdrOutputConversionSupport;

    binder::Status getSupportStatus =

            sf->getHdrOutputConversionSupport(&hdrOutputConversionSupport);

    ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(getSupportStatus));



    std::vector<gui::HdrConversionCapability> capabilities;

    binder::Status status = sf->getHdrConversionCapabilities(&capabilities);



    if (hdrOutputConversionSupport) {

        ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(status));

    } else {

        ASSERT_EQ(INVALID_OPERATION, statusTFromBinderStatus(status));

    }

}



TEST(HdrOutputControlTest, testSetHdrConversionStrategy) {

    sp<gui::ISurfaceComposer> sf(ComposerServiceAIDL::getComposerService());



    bool hdrOutputConversionSupport;

    binder::Status getSupportStatus =

            sf->getHdrOutputConversionSupport(&hdrOutputConversionSupport);

    ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(getSupportStatus));



    std::vector<HdrConversionStrategy> strategies =

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

                                           GuiHdrConversionStrategyTag::passthrough)>),

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

                                           GuiHdrConversionStrategyTag::autoAllowedHdrTypes)>),

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

                                           GuiHdrConversionStrategyTag::forceHdrConversion)>)};

    int32_t outPreferredHdrOutputType = 0;



    for (HdrConversionStrategy strategy : strategies) {

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



        if (hdrOutputConversionSupport) {

            ASSERT_EQ(NO_ERROR, statusTFromBinderStatus(status));

        } else {

            ASSERT_EQ(INVALID_OPERATION, statusTFromBinderStatus(status));

        }

    }

}



} // namespace android