Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev (184b17dd) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraMetadata.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -873,6 +873,20 @@ public abstract class CameraMetadata {
		*/
		public static final int STATISTICS_FACE_DETECT_MODE_FULL = 2;

		//
		// Enumeration values for CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE
		//

		/**
		* @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE
		*/
		public static final int STATISTICS_LENS_SHADING_MAP_MODE_OFF = 0;

		/**
		* @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE
		*/
		public static final int STATISTICS_LENS_SHADING_MAP_MODE_ON = 1;

		//
		// Enumeration values for CaptureRequest#TONEMAP_MODE
		//

+16 −0

Original line number	Diff line number	Diff line
		@@ -955,6 +955,22 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
		public static final Key<Integer> STATISTICS_FACE_DETECT_MODE =
		new Key<Integer>("android.statistics.faceDetectMode", int.class);

		/**
		* <p>
		* Whether the HAL needs to output the lens
		* shading map in output result metadata
		* </p>
		* <p>
		* When set to ON,
		* android.statistics.lensShadingMap must be provided in
		* the output result metdata.
		* </p>
		* @see #STATISTICS_LENS_SHADING_MAP_MODE_OFF
		* @see #STATISTICS_LENS_SHADING_MAP_MODE_ON
		*/
		public static final Key<Integer> STATISTICS_LENS_SHADING_MAP_MODE =
		new Key<Integer>("android.statistics.lensShadingMapMode", int.class);

		/**
		* <p>
		* Table mapping blue input values to output