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

Commit 774ade23 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "Camera VTS: Updated ColorSpaceNamed and color space tests." into udc-dev am: 7dd74a94 

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



Change-Id: I675910a4fde7447c124799324d4764d79284e161
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 693cbf1c 7dd74a94

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+3 −12
Original line number Diff line number Diff line
@@ -2025,16 +2025,7 @@ TEST_P(CameraAidlTest, process10BitDynamicRangeRequest) { 
}



TEST_P(CameraAidlTest, process8BitColorSpaceRequests) {

    static int profiles[] = {

        ColorSpaceNamed::BT709,

        ColorSpaceNamed::DCI_P3,

        ColorSpaceNamed::DISPLAY_P3,

        ColorSpaceNamed::EXTENDED_SRGB,

        ColorSpaceNamed::LINEAR_EXTENDED_SRGB,

        ColorSpaceNamed::NTSC_1953,

        ColorSpaceNamed::SMPTE_C,

        ColorSpaceNamed::SRGB

    };

    static int profiles[] = {ColorSpaceNamed::DISPLAY_P3, ColorSpaceNamed::SRGB};



    for (int32_t i = 0; i < sizeof(profiles) / sizeof(profiles[0]); i++) {

        processColorSpaceRequest(static_cast<RequestAvailableColorSpaceProfilesMap>(profiles[i]),
@@ -2059,10 +2050,10 @@ TEST_P(CameraAidlTest, process10BitColorSpaceRequests) { 
        ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_DOLBY_VISION_8B_HDR_OEM_PO

    };



    // Process all dynamic range profiles with BT2020

    // Process all dynamic range profiles with BT2020_HLG

    for (int32_t i = 0; i < sizeof(dynamicRangeProfiles) / sizeof(dynamicRangeProfiles[0]); i++) {

        processColorSpaceRequest(

                static_cast<RequestAvailableColorSpaceProfilesMap>(ColorSpaceNamed::BT2020),

                static_cast<RequestAvailableColorSpaceProfilesMap>(ColorSpaceNamed::BT2020_HLG),

                static_cast<RequestAvailableDynamicRangeProfilesMap>(dynamicRangeProfiles[i]));

    }

}

camera/provider/aidl/vts/camera_aidl_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -3085,6 +3085,10 @@ const char* CameraAidlTest::getColorSpaceProfileString( 
            return "CIE_XYZ";

        case ColorSpaceNamed::CIE_LAB:

            return "CIE_LAB";

        case ColorSpaceNamed::BT2020_HLG:

            return "BT2020_HLG";

        case ColorSpaceNamed::BT2020_PQ:

            return "BT2020_PQ";

        default:

            return "INVALID";

    }

camera/provider/aidl/vts/camera_aidl_test.h

+3 −1
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ class CameraAidlTest : public ::testing::TestWithParam<std::string> { 
        ACES,

        ACESCG,

        CIE_XYZ,

        CIE_LAB

        CIE_LAB,

        BT2020_HLG,

        BT2020_PQ

    };



    struct AvailableZSLInputOutput {