Merge "Camera2: doc update for HAL3.3 tonemapping change" (98bafbf9) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -13049,7 +13049,11 @@ package android.hardware.camera2 {
		field public static final int SYNC_MAX_LATENCY_UNKNOWN = -1; // 0xffffffff
		field public static final int TONEMAP_MODE_CONTRAST_CURVE = 0; // 0x0
		field public static final int TONEMAP_MODE_FAST = 1; // 0x1
		field public static final int TONEMAP_MODE_GAMMA_VALUE = 3; // 0x3
		field public static final int TONEMAP_MODE_HIGH_QUALITY = 2; // 0x2
		field public static final int TONEMAP_MODE_PRESET_CURVE = 4; // 0x4
		field public static final int TONEMAP_PRESET_CURVE_REC709 = 1; // 0x1
		field public static final int TONEMAP_PRESET_CURVE_SRGB = 0; // 0x0
		}

		public class CaptureFailure {
		@@ -13117,7 +13121,9 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> STATISTICS_HOT_PIXEL_MAP_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> STATISTICS_LENS_SHADING_MAP_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.TonemapCurve> TONEMAP_CURVE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> TONEMAP_GAMMA;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> TONEMAP_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> TONEMAP_PRESET_CURVE;
		}

		public static final class CaptureRequest.Builder {
		@@ -13205,7 +13211,9 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_LENS_SHADING_MAP_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_SCENE_FLICKER;
		field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.TonemapCurve> TONEMAP_CURVE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> TONEMAP_GAMMA;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> TONEMAP_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> TONEMAP_PRESET_CURVE;
		}

		public static final class CaptureResult.Key {

api/system-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -13319,7 +13319,11 @@ package android.hardware.camera2 {
		field public static final int SYNC_MAX_LATENCY_UNKNOWN = -1; // 0xffffffff
		field public static final int TONEMAP_MODE_CONTRAST_CURVE = 0; // 0x0
		field public static final int TONEMAP_MODE_FAST = 1; // 0x1
		field public static final int TONEMAP_MODE_GAMMA_VALUE = 3; // 0x3
		field public static final int TONEMAP_MODE_HIGH_QUALITY = 2; // 0x2
		field public static final int TONEMAP_MODE_PRESET_CURVE = 4; // 0x4
		field public static final int TONEMAP_PRESET_CURVE_REC709 = 1; // 0x1
		field public static final int TONEMAP_PRESET_CURVE_SRGB = 0; // 0x0
		}

		public class CaptureFailure {
		@@ -13387,7 +13391,9 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> STATISTICS_HOT_PIXEL_MAP_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> STATISTICS_LENS_SHADING_MAP_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<android.hardware.camera2.params.TonemapCurve> TONEMAP_CURVE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> TONEMAP_GAMMA;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> TONEMAP_MODE;
		field public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> TONEMAP_PRESET_CURVE;
		}

		public static final class CaptureRequest.Builder {
		@@ -13475,7 +13481,9 @@ package android.hardware.camera2 {
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_LENS_SHADING_MAP_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_SCENE_FLICKER;
		field public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.TonemapCurve> TONEMAP_CURVE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> TONEMAP_GAMMA;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> TONEMAP_MODE;
		field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> TONEMAP_PRESET_CURVE;
		}

		public static final class CaptureResult.Key {

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -2299,8 +2299,13 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		/**
		* <p>List of tonemapping modes for {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} that are supported by this camera
		* device.</p>
		* <p>Camera devices that support the MANUAL_POST_PROCESSING capability will always list
		* CONTRAST_CURVE and FAST. This includes all FULL level devices.</p>
		* <p>Camera devices that support the MANUAL_POST_PROCESSING capability will always contain
		* at least one of below mode combinations:</p>
		* <ul>
		* <li>CONTRAST_CURVE and FAST</li>
		* <li>GAMMA_VALUE, PRESET_CURVE, and FAST</li>
		* </ul>
		* <p>This includes all FULL level devices.</p>
		* <p><b>Range of valid values:</b><br>
		* Any value listed in {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode}</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

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

+51 −2

Original line number	Diff line number	Diff line
		@@ -374,13 +374,19 @@ public abstract class CameraMetadata<TKey> {
		* The camera device supports basic manual control of the image post-processing
		* stages. This means the following controls are guaranteed to be supported:</p>
		* <ul>
		* <li>Manual tonemap control<ul>
		* <li>
		* <p>Manual tonemap control</p>
		* <ul>
		* <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>
		* </ul>
		* </li>
		* <li>Manual white balance control<ul>
		* <li>
		* <p>Manual white balance control</p>
		* <ul>
		* <li>{@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform}</li>
		* <li>{@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains}</li>
		* </ul>
		@@ -410,8 +416,10 @@ 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;
		@@ -2104,6 +2112,47 @@ 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
		* 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>
		* <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>
		* <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>
		* <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;

		//
		// Enumeration values for CaptureRequest#TONEMAP_PRESET_CURVE
		//

		/**
		* <p>Tonemapping curve is defined by sRGB</p>
		* @see CaptureRequest#TONEMAP_PRESET_CURVE
		*/
		public static final int TONEMAP_PRESET_CURVE_SRGB = 0;

		/**
		* <p>Tonemapping curve is defined by ITU-R BT.709</p>
		* @see CaptureRequest#TONEMAP_PRESET_CURVE
		*/
		public static final int TONEMAP_PRESET_CURVE_REC709 = 1;

		//
		// Enumeration values for CaptureResult#CONTROL_AE_STATE
		//

core/java/android/hardware/camera2/CaptureRequest.java

+50 −0

Original line number	Diff line number	Diff line
		@@ -2380,6 +2380,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* <li>{@link #TONEMAP_MODE_CONTRAST_CURVE CONTRAST_CURVE}</li>
		* <li>{@link #TONEMAP_MODE_FAST FAST}</li>
		* <li>{@link #TONEMAP_MODE_HIGH_QUALITY HIGH_QUALITY}</li>
		* <li>{@link #TONEMAP_MODE_GAMMA_VALUE GAMMA_VALUE}</li>
		* <li>{@link #TONEMAP_MODE_PRESET_CURVE PRESET_CURVE}</li>
		* </ul></p>
		* <p><b>Available values for this device:</b><br>
		* {@link CameraCharacteristics#TONEMAP_AVAILABLE_TONE_MAP_MODES android.tonemap.availableToneMapModes}</p>
		@@ -2395,11 +2397,59 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
		* @see #TONEMAP_MODE_CONTRAST_CURVE
		* @see #TONEMAP_MODE_FAST
		* @see #TONEMAP_MODE_HIGH_QUALITY
		* @see #TONEMAP_MODE_GAMMA_VALUE
		* @see #TONEMAP_MODE_PRESET_CURVE
		*/
		@PublicKey
		public static final Key<Integer> TONEMAP_MODE =
		new Key<Integer>("android.tonemap.mode", int.class);

		/**
		* <p>Tonemapping curve to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} is
		* GAMMA_VALUE</p>
		* <p>The tonemap curve will be defined the following formula:
		* * OUT = pow(IN, 1.0 / gamma)
		* where IN and OUT is the input pixel value scaled to range [0.0, 1.0],
		* pow is the power function and gamma is the gamma value specified by this
		* key.</p>
		* <p>The same curve will be applied to all color channels. The camera device
		* may clip the input gamma value to its supported range. The actual applied
		* value will be returned in capture result.</p>
		* <p>The valid range of gamma value varies on different devices, but values
		* within [1.0, 5.0] are guaranteed not to be clipped.</p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		*
		* @see CaptureRequest#TONEMAP_MODE
		*/
		@PublicKey
		public static final Key<Float> TONEMAP_GAMMA =
		new Key<Float>("android.tonemap.gamma", float.class);

		/**
		* <p>Tonemapping curve to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} is
		* PRESET_CURVE</p>
		* <p>The tonemap curve will be defined by specified standard.</p>
		* <p>sRGB (approximated by 16 control points):</p>
		* <p><img alt="sRGB tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png" /></p>
		* <p>Rec. 709 (approximated by 16 control points):</p>
		* <p><img alt="Rec. 709 tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/rec709_tonemap.png" /></p>
		* <p>Note that above figures show a 16 control points approximation of preset
		* curves. Camera devices may apply a different approximation to the curve.</p>
		* <p><b>Possible values:</b>
		* <ul>
		* <li>{@link #TONEMAP_PRESET_CURVE_SRGB SRGB}</li>
		* <li>{@link #TONEMAP_PRESET_CURVE_REC709 REC709}</li>
		* </ul></p>
		* <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
		*
		* @see CaptureRequest#TONEMAP_MODE
		* @see #TONEMAP_PRESET_CURVE_SRGB
		* @see #TONEMAP_PRESET_CURVE_REC709
		*/
		@PublicKey
		public static final Key<Integer> TONEMAP_PRESET_CURVE =
		new Key<Integer>("android.tonemap.presetCurve", int.class);

		/**
		* <p>This LED is nominally used to indicate to the user
		* that the camera is powered on and may be streaming images back to the