Camera CTS: Get RAW_SENSOR sizes only for UHR sensors Its possible that a camera device has the MAXIMUM_RESOLUTION StreamConfigurationMap without RAW_SENSOR sizes. This can happen in the case when a camera device supports MAXIMUM_RESOLUTION sensor pixel mode but not the ULTRA_HIGH_RESOLUTION_SENSOR capability. Don't get RAW_SENSOR sizes for those camera devices in RobustnessTest.java. Bug: 288835247 Test: RobustnessTest.java#testVerifyMandatoryOutputCombinationTables Change-Id: I8d1e3025ea4f95734a58dbc4a7e60634e2ef7895 Merged-In: I8d1e3025ea4f95734a58dbc4a7e60634e2ef7895 Signed-off-by: Jayant Chowdhary <jchowdhary@google.com> (cherry picked from commit 998d852623b5f11da391821799fea7b567080383)
diff --git a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java index 7bdd2a3..5347ff9 100644 --- a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
@@ -3124,8 +3124,8 @@ CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION); mMaxRawSize = (rawSizes.length != 0) ? CameraTestUtils.getMaxSize(rawSizes) : null; - mMaxResolutionRawSize = (maxResConfigs != null) - ? CameraTestUtils.getMaxSize( + mMaxResolutionRawSize = sm.isUltraHighResolutionSensor() ? + CameraTestUtils.getMaxSize( maxResConfigs.getOutputSizes(ImageFormat.RAW_SENSOR)) : null; @@ -3144,7 +3144,7 @@ mMaxJpegSizes[RECORD] = getMaxRecordingSize(cameraId); } - if (maxResConfigs != null) { + if (sm.isUltraHighResolutionSensor()) { mMaxYuvSizes[MAX_RES] = CameraTestUtils.getMaxSize( maxResConfigs.getOutputSizes(ImageFormat.YUV_420_888)); mMaxJpegSizes[MAX_RES] = CameraTestUtils.getMaxSize( @@ -3302,8 +3302,9 @@ mMaxPrivInputSizes[INPUT_MAXIMUM] = privInputSizes != null ? CameraTestUtils.getMaxSize(privInputSizes) : null; - Size[] maxResPrivInputSizes = maxResConfigs != null - ? maxResConfigs.getInputSizes(ImageFormat.PRIVATE) + Size[] maxResPrivInputSizes = + sm.isUltraHighResolutionSensor() ? + maxResConfigs.getInputSizes(ImageFormat.PRIVATE) : null; mMaxPrivInputSizes[INPUT_MAX_RES] = maxResPrivInputSizes != null ? CameraTestUtils.getMaxSize(maxResPrivInputSizes) @@ -3313,8 +3314,8 @@ mMaxYuvInputSizes[INPUT_MAXIMUM] = yuvInputSizes != null ? CameraTestUtils.getMaxSize(yuvInputSizes) : null; - Size[] maxResYuvInputSizes = maxResConfigs != null - ? maxResConfigs.getInputSizes(ImageFormat.YUV_420_888) + Size[] maxResYuvInputSizes = sm.isUltraHighResolutionSensor() ? + maxResConfigs.getInputSizes(ImageFormat.YUV_420_888) : null; mMaxYuvInputSizes[INPUT_MAX_RES] = maxResYuvInputSizes != null ? CameraTestUtils.getMaxSize(maxResYuvInputSizes)