From 86298a90d76e2f2e40b592a157a6212bfe332e9c Mon Sep 17 00:00:00 2001 From: Emilian Peev Date: Wed, 15 Nov 2023 20:08:17 +0000 Subject: Camera: Handle Jpeg_R size querie for basic extensions Basic extension currently do not have way to generate and output Jpeg_R/UltraHDR images. Check and return an empty size list in this particular scenario. Bug: 311151367 Test: atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionCharacteristicsTest.java atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java Change-Id: I505d8462563f14e767b231c313e364ed5c3ab55b --- .../android/hardware/camera2/CameraExtensionCharacteristics.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java index a978bd8a3bdf..0a61c32a9cf5 100644 --- a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java @@ -736,6 +736,9 @@ public final class CameraExtensionCharacteristics { return generateJpegSupportedSizes( extenders.second.getSupportedPostviewResolutions(sz), streamMap); + } else if (format == ImageFormat.JPEG_R) { + // Jpeg_R/UltraHDR is currently not supported in the basic extension case + return new ArrayList<>(); } else { throw new IllegalArgumentException("Unsupported format: " + format); } @@ -891,6 +894,9 @@ public final class CameraExtensionCharacteristics { } else { return generateSupportedSizes(null, format, streamMap); } + } else if (format == ImageFormat.JPEG_R) { + // Jpeg_R/UltraHDR is currently not supported in the basic extension case + return new ArrayList<>(); } else { throw new IllegalArgumentException("Unsupported format: " + format); } -- cgit v1.2.3-59-g8ed1b