Merge "Camera: Allow multi-resolution raw reprocessing" into main (6bc9cc17) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -1571,8 +1571,7 @@ public class CameraDeviceImpl extends CameraDevice
		}

		// Allow RAW formats, even when not advertised.
		if (inputFormat == ImageFormat.RAW_PRIVATE \|\| inputFormat == ImageFormat.RAW10
		\|\| inputFormat == ImageFormat.RAW12 \|\| inputFormat == ImageFormat.RAW_SENSOR) {
		if (isRawFormat(inputFormat)) {
		return true;
		}

		@@ -1642,6 +1641,11 @@ public class CameraDeviceImpl extends CameraDevice
		}
		}

		// Allow RAW formats, even when not advertised.
		if (Flags.multiResRawReprocessing() && isRawFormat(inputFormat)) {
		return;
		}

		if (validFormat == false) {
		throw new IllegalArgumentException("multi-resolution input format " +
		inputFormat + " is not valid");
		@@ -2584,6 +2588,11 @@ public class CameraDeviceImpl extends CameraDevice
		return mCharacteristics;
		}

		private boolean isRawFormat(int format) {
		return (format == ImageFormat.RAW_PRIVATE \|\| format == ImageFormat.RAW10
		\|\| format == ImageFormat.RAW12 \|\| format == ImageFormat.RAW_SENSOR);
		}

		/**
		* Listener for binder death.
		*