diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp index 398d201619..a755d57d1d 100644 --- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp +++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp @@ -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(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(ColorSpaceNamed::BT2020), + static_cast(ColorSpaceNamed::BT2020_HLG), static_cast(dynamicRangeProfiles[i])); } } diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp index 42b5b7dc55..058770ef5a 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.cpp +++ b/camera/provider/aidl/vts/camera_aidl_test.cpp @@ -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"; } diff --git a/camera/provider/aidl/vts/camera_aidl_test.h b/camera/provider/aidl/vts/camera_aidl_test.h index bf409d9b17..4b4c039d4a 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.h +++ b/camera/provider/aidl/vts/camera_aidl_test.h @@ -145,7 +145,9 @@ class CameraAidlTest : public ::testing::TestWithParam { ACES, ACESCG, CIE_XYZ, - CIE_LAB + CIE_LAB, + BT2020_HLG, + BT2020_PQ }; struct AvailableZSLInputOutput {