Merge "Adding JPEG_R as a valid ImageFormat in Camera Extensions" into main (a7d016f9) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -858,6 +858,7 @@ public final class CameraExtensionCharacteristics {
		switch(format) {
		case ImageFormat.YUV_420_888:
		case ImageFormat.JPEG:
		case ImageFormat.JPEG_R:
		break;
		default:
		throw new IllegalArgumentException("Unsupported format: " + format);

+6 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,8 @@ public final class CameraExtensionUtils {

		public static final int[] SUPPORTED_CAPTURE_OUTPUT_FORMATS = {
		CameraExtensionCharacteristics.PROCESSING_INPUT_FORMAT,
		ImageFormat.JPEG
		ImageFormat.JPEG,
		ImageFormat.JPEG_R
		};

		public static class SurfaceInfo {
		@@ -92,6 +93,10 @@ public final class CameraExtensionUtils {
		(dataspace == StreamConfigurationMap.HAL_DATASPACE_V0_JFIF)) {
		surfaceInfo.mFormat = ImageFormat.JPEG;
		return surfaceInfo;
		} else if ((nativeFormat == StreamConfigurationMap.HAL_PIXEL_FORMAT_BLOB)
		&& (dataspace == StreamConfigurationMap.HAL_DATASPACE_JPEG_R)) {
		surfaceInfo.mFormat = ImageFormat.JPEG_R;
		return surfaceInfo;
		}

		return surfaceInfo;