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

This commit is contained in:
Austin Borger
2023-03-22 20:04:15 +00:00
committed by Android (Google) Code Review
3 changed files with 10 additions and 13 deletions

View File

@@ -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]));
}
}

View File

@@ -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";
}

View File

@@ -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 {