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

Commit 14f4d442 authored by Kriti Dang's avatar Kriti Dang Committed by Automerger Merge Worker
Browse files

Merge "Change the HDR conversion VTS test to take into account sink device... 

Merge "Change the HDR conversion VTS test to take into account sink device capabilities" into udc-dev am: 9bd4fb37

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23029343



Change-Id: Ib0f14d36f547b85bafa9ec8761a7a7aaae2156e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d65b493c 9bd4fb37

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+12 −0
Original line number Diff line number Diff line
@@ -655,8 +655,15 @@ TEST_P(GraphicsComposerAidlTest, SetHdrConversionStrategy_Force) { 
        return;

    }

    const auto& [status, conversionCapabilities] = mComposerClient->getHdrConversionCapabilities();

    const auto& [status2, hdrCapabilities] =

            mComposerClient->getHdrCapabilities(getPrimaryDisplayId());

    const auto& hdrTypes = hdrCapabilities.types;

    for (auto conversionCapability : conversionCapabilities) {

        if (conversionCapability.outputType != common::Hdr::INVALID) {

            if (std::find(hdrTypes.begin(), hdrTypes.end(), conversionCapability.outputType) ==

                hdrTypes.end()) {

                continue;

            }

            common::HdrConversionStrategy hdrConversionStrategy;

            hdrConversionStrategy.set<common::HdrConversionStrategy::Tag::forceHdrConversion>(

                    conversionCapability.outputType);
@@ -674,6 +681,11 @@ TEST_P(GraphicsComposerAidlTest, SetHdrConversionStrategy_Auto) { 
        return;

    }

    const auto& [status, conversionCapabilities] = mComposerClient->getHdrConversionCapabilities();

    const auto& [status2, hdrCapabilities] =

            mComposerClient->getHdrCapabilities(getPrimaryDisplayId());

    if (hdrCapabilities.types.size() <= 0) {

        return;

    }

    std::vector<aidl::android::hardware::graphics::common::Hdr> autoHdrTypes;

    for (auto conversionCapability : conversionCapabilities) {

        if (conversionCapability.outputType != common::Hdr::INVALID) {