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

Commit 54b2236b authored by Austin Borger's avatar Austin Borger
Browse files

Camera VTS: Updated ColorSpaceNamed and color space tests. 

BT2020_HLG and BT2020_PQ were adding since the ColorSpaceProfiles tests
were checked in. Add those to the ColorSpaceNamed enum.

Also remove unsupported color spaces from the list of 8-bit color spaces
to test, and change BT2020 to BT2020_HLG.

Test: Ran on Pixel 7.
Bug: 274789672
Change-Id: I9625a1f05017ccdcb383cdf8fd13084688acc79f
parent 2da97768

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

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

}





TEST_P(CameraAidlTest, process8BitColorSpaceRequests) {

TEST_P(CameraAidlTest, process8BitColorSpaceRequests) {

    static int profiles[] = {

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

        ColorSpaceNamed::BT709,

        ColorSpaceNamed::DCI_P3,

        ColorSpaceNamed::DISPLAY_P3,

        ColorSpaceNamed::EXTENDED_SRGB,

        ColorSpaceNamed::LINEAR_EXTENDED_SRGB,

        ColorSpaceNamed::NTSC_1953,

        ColorSpaceNamed::SMPTE_C,

        ColorSpaceNamed::SRGB

    };





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

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

        processColorSpaceRequest(static_cast<RequestAvailableColorSpaceProfilesMap>(profiles[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

        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++) {

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

        processColorSpaceRequest(

        processColorSpaceRequest(

                static_cast<RequestAvailableColorSpaceProfilesMap>(ColorSpaceNamed::BT2020),

                static_cast<RequestAvailableColorSpaceProfilesMap>(ColorSpaceNamed::BT2020_HLG),

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

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

    }

    }

}

}

camera/provider/aidl/vts/camera_aidl_test.cpp

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

            return "CIE_XYZ";

        case ColorSpaceNamed::CIE_LAB:

        case ColorSpaceNamed::CIE_LAB:

            return "CIE_LAB";

            return "CIE_LAB";

        case ColorSpaceNamed::BT2020_HLG:

            return "BT2020_HLG";

        case ColorSpaceNamed::BT2020_PQ:

            return "BT2020_PQ";

        default:

        default:

            return "INVALID";

            return "INVALID";

    }

    }

camera/provider/aidl/vts/camera_aidl_test.h

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

        ACES,

        ACESCG,

        ACESCG,

        CIE_XYZ,

        CIE_XYZ,

        CIE_LAB

        CIE_LAB,

        BT2020_HLG,

        BT2020_PQ

    };

    };





    struct AvailableZSLInputOutput {

    struct AvailableZSLInputOutput {