Merge "Camera: codegen doc update" (87c41629) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraCharacteristics.java

+38 −38

Original line number	Diff line number	Diff line
		@@ -423,17 +423,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<Rational> CONTROL_AE_COMPENSATION_STEP =
		new Key<Rational>("android.control.aeCompensationStep", Rational.class);

		/**
		* <p>Whether the camera device supports {@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock}</p>
		* <p>LIMITED or FULL devices will always list <code>true</code></p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_AE_LOCK
		*/
		@PublicKey
		public static final Key<Boolean> CONTROL_AE_LOCK_AVAILABLE =
		new Key<Boolean>("android.control.aeLockAvailable", boolean.class);

		/**
		* <p>List of auto-focus (AF) modes for {@link CaptureRequest#CONTROL_AF_MODE android.control.afMode} that are
		* supported by this camera device.</p>
		@@ -481,22 +470,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<int[]> CONTROL_AVAILABLE_EFFECTS =
		new Key<int[]>("android.control.availableEffects", int[].class);

		/**
		* <p>List of control modes for {@link CaptureRequest#CONTROL_MODE android.control.mode} that are supported by this camera
		* device.</p>
		* <p>This list contains control modes that can be set for the camera device.
		* LEGACY mode devices will always support AUTO mode. LIMITED and FULL
		* devices will always support OFF, AUTO modes.</p>
		* <p><b>Range of valid values:</b><br>
		* Any value listed in {@link CaptureRequest#CONTROL_MODE android.control.mode}</p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_MODE
		*/
		@PublicKey
		public static final Key<int[]> CONTROL_AVAILABLE_MODES =
		new Key<int[]>("android.control.availableModes", int[].class);

		/**
		* <p>List of scene modes for {@link CaptureRequest#CONTROL_SCENE_MODE android.control.sceneMode} that are supported by this camera
		* device.</p>
		@@ -558,17 +531,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<int[]> CONTROL_AWB_AVAILABLE_MODES =
		new Key<int[]>("android.control.awbAvailableModes", int[].class);

		/**
		* <p>Whether the camera device supports {@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock}</p>
		* <p>LIMITED or FULL devices will always list <code>true</code></p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_AWB_LOCK
		*/
		@PublicKey
		public static final Key<Boolean> CONTROL_AWB_LOCK_AVAILABLE =
		new Key<Boolean>("android.control.awbLockAvailable", boolean.class);

		/**
		* <p>List of the maximum number of regions that can be used for metering in
		* auto-exposure (AE), auto-white balance (AWB), and auto-focus (AF);
		@@ -675,6 +637,44 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		public static final Key<android.hardware.camera2.params.HighSpeedVideoConfiguration[]> CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS =
		new Key<android.hardware.camera2.params.HighSpeedVideoConfiguration[]>("android.control.availableHighSpeedVideoConfigurations", android.hardware.camera2.params.HighSpeedVideoConfiguration[].class);

		/**
		* <p>Whether the camera device supports {@link CaptureRequest#CONTROL_AE_LOCK android.control.aeLock}</p>
		* <p>LIMITED or FULL devices will always list <code>true</code></p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_AE_LOCK
		*/
		@PublicKey
		public static final Key<Boolean> CONTROL_AE_LOCK_AVAILABLE =
		new Key<Boolean>("android.control.aeLockAvailable", boolean.class);

		/**
		* <p>Whether the camera device supports {@link CaptureRequest#CONTROL_AWB_LOCK android.control.awbLock}</p>
		* <p>LIMITED or FULL devices will always list <code>true</code></p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_AWB_LOCK
		*/
		@PublicKey
		public static final Key<Boolean> CONTROL_AWB_LOCK_AVAILABLE =
		new Key<Boolean>("android.control.awbLockAvailable", boolean.class);

		/**
		* <p>List of control modes for {@link CaptureRequest#CONTROL_MODE android.control.mode} that are supported by this camera
		* device.</p>
		* <p>This list contains control modes that can be set for the camera device.
		* LEGACY mode devices will always support AUTO mode. LIMITED and FULL
		* devices will always support OFF, AUTO modes.</p>
		* <p><b>Range of valid values:</b><br>
		* Any value listed in {@link CaptureRequest#CONTROL_MODE android.control.mode}</p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_MODE
		*/
		@PublicKey
		public static final Key<int[]> CONTROL_AVAILABLE_MODES =
		new Key<int[]>("android.control.availableModes", int[].class);

		/**
		* <p>List of edge enhancement modes for {@link CaptureRequest#EDGE_MODE android.edge.mode} that are supported by this camera
		* device.</p>

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

+6 −12

Original line number	Diff line number	Diff line
		@@ -380,8 +380,8 @@ public abstract class CameraMetadata<TKey> {
		* <li>{@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}</li>
		* <li>{@link CaptureRequest#TONEMAP_MODE android.tonemap.mode}</li>
		* <li>{@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}</li>
		* <li>{@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma}</li>
		* <li>{@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve}</li>
		* <li>android.tonemap.gamma</li>
		* <li>android.tonemap.presetCurve</li>
		* </ul>
		* </li>
		* <li>
		@@ -416,10 +416,8 @@ public abstract class CameraMetadata<TKey> {
		* @see CaptureRequest#SHADING_MODE
		* @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE
		* @see CaptureRequest#TONEMAP_CURVE
		* @see CaptureRequest#TONEMAP_GAMMA
		* @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS
		* @see CaptureRequest#TONEMAP_MODE
		* @see CaptureRequest#TONEMAP_PRESET_CURVE
		* @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
		*/
		public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2;
		@@ -2113,26 +2111,22 @@ public abstract class CameraMetadata<TKey> {
		public static final int TONEMAP_MODE_HIGH_QUALITY = 2;

		/**
		* <p>Use the gamma value specified in {@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma} to peform
		* <p>Use the gamma value specified in android.tonemap.gamma to peform
		* tonemapping.</p>
		* <p>All color enhancement and tonemapping must be disabled, except
		* for applying the tonemapping curve specified by {@link CaptureRequest#TONEMAP_GAMMA android.tonemap.gamma}.</p>
		* for applying the tonemapping curve specified by android.tonemap.gamma.</p>
		* <p>Must not slow down frame rate relative to raw sensor output.</p>
		*
		* @see CaptureRequest#TONEMAP_GAMMA
		* @see CaptureRequest#TONEMAP_MODE
		*/
		public static final int TONEMAP_MODE_GAMMA_VALUE = 3;

		/**
		* <p>Use the preset tonemapping curve specified in
		* {@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve} to peform tonemapping.</p>
		* android.tonemap.presetCurve to peform tonemapping.</p>
		* <p>All color enhancement and tonemapping must be disabled, except
		* for applying the tonemapping curve specified by
		* {@link CaptureRequest#TONEMAP_PRESET_CURVE android.tonemap.presetCurve}.</p>
		* android.tonemap.presetCurve.</p>
		* <p>Must not slow down frame rate relative to raw sensor output.</p>
		*
		* @see CaptureRequest#TONEMAP_PRESET_CURVE
		* @see CaptureRequest#TONEMAP_MODE
		*/
		public static final int TONEMAP_MODE_PRESET_CURVE = 4;