Merge "Camera: Handle Jpeg_R size querie for basic extensions" into main (cc866b9d) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}