Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8490ace7 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Eino-Ville Talvala
Browse files

Camera2: switch API interface to java classses 

android.sensor.info.physicalSize: float[] -> SizeF
android.statistics.hotPixelMap: int[] -> Point[]
android.tonemap.curve[Red|Green|Blue]: float[] -> TonemapCurve

Bug: 14628001
Change-Id: I1e085f5e640a059852fcb504b6dd5f884039e653
parent 2bb91a7a

api/current.txt

+2 −6
Original line number Diff line number Diff line
@@ -12507,9 +12507,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CaptureRequest.Key STATISTICS_FACE_DETECT_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key STATISTICS_HOT_PIXEL_MAP_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key STATISTICS_LENS_SHADING_MAP_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_CURVE_BLUE;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_CURVE_GREEN;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_CURVE_RED;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_CURVE;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_MODE;

  }










@@ -12596,9 +12594,7 @@ package android.hardware.camera2 {













    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_LENS_SHADING_MAP;















    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_LENS_SHADING_MAP_MODE;















    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_SCENE_FLICKER;













    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_CURVE_BLUE;













    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_CURVE_GREEN;













    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_CURVE_RED;













    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_CURVE;















    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_MODE;















  }







































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



+5
−8




























Original line number
Diff line number
Diff line








@@ -1378,8 +1378,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri













     * array</p>















     * <p>Needed for FOV calculation for old API</p>















     */













    public static final Key<float[]> SENSOR_INFO_PHYSICAL_SIZE =













            new Key<float[]>("android.sensor.info.physicalSize", float[].class);













    public static final Key<android.util.SizeF> SENSOR_INFO_PHYSICAL_SIZE =













            new Key<android.util.SizeF>("android.sensor.info.physicalSize", android.util.SizeF.class);































    /**















     * <p>Dimensions of full pixel array, possibly










@@ -1686,19 +1686,16 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri





























    /**















     * <p>Maximum number of supported points in the













     * tonemap curve that can be used for {@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed}, or













     * {@link CaptureRequest#TONEMAP_CURVE_GREEN android.tonemap.curveGreen}, or {@link CaptureRequest#TONEMAP_CURVE_BLUE android.tonemap.curveBlue}.</p>













     * tonemap curve that can be used for {@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}.</p>















     * <p>If the actual number of points provided by the application (in













     * android.tonemap.curve*)  is less than max, the camera device will













     * {@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}*)  is less than max, the camera device will















     * resample the curve to its internal representation, using linear















     * interpolation.</p>















     * <p>The output curves in the result metadata may have a different number















     * of points than the input curves, and will represent the actual















     * hardware curves used as closely as possible when linearly interpolated.</p>















     *













     * @see CaptureRequest#TONEMAP_CURVE_BLUE













     * @see CaptureRequest#TONEMAP_CURVE_GREEN













     * @see CaptureRequest#TONEMAP_CURVE_RED













     * @see CaptureRequest#TONEMAP_CURVE















     */















    public static final Key<Integer> TONEMAP_MAX_CURVE_POINTS =















            new Key<Integer>("android.tonemap.maxCurvePoints", int.class);

































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



+5
−12




























Original line number
Diff line number
Diff line








@@ -279,9 +279,7 @@ public abstract class CameraMetadata<TKey> {













     * <p>TODO: This should be @hide</p>















     * <ul>















     * <li>Manual tonemap control<ul>













     * <li>{@link CaptureRequest#TONEMAP_CURVE_BLUE android.tonemap.curveBlue}</li>













     * <li>{@link CaptureRequest#TONEMAP_CURVE_GREEN android.tonemap.curveGreen}</li>













     * <li>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed}</li>













     * <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>















     * </ul>









@@ -306,9 +304,7 @@ public abstract class CameraMetadata<TKey> {













     * @see CaptureRequest#COLOR_CORRECTION_TRANSFORM















     * @see CameraCharacteristics#LENS_INFO_SHADING_MAP_SIZE















     * @see CaptureResult#STATISTICS_LENS_SHADING_MAP













     * @see CaptureRequest#TONEMAP_CURVE_BLUE













     * @see CaptureRequest#TONEMAP_CURVE_GREEN













     * @see CaptureRequest#TONEMAP_CURVE_RED













     * @see CaptureRequest#TONEMAP_CURVE















     * @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS















     * @see CaptureRequest#TONEMAP_MODE















     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES










@@ -1548,17 +1544,14 @@ public abstract class CameraMetadata<TKey> {





























    /**















     * <p>Use the tone mapping curve specified in













     * the android.tonemap.curve* entries.</p>













     * the {@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}* entries.</p>















     * <p>All color enhancement and tonemapping must be disabled, except















     * for applying the tonemapping curve specified by













     * {@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed}, {@link CaptureRequest#TONEMAP_CURVE_BLUE android.tonemap.curveBlue}, or













     * {@link CaptureRequest#TONEMAP_CURVE_GREEN android.tonemap.curveGreen}.</p>













     * {@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}.</p>















     * <p>Must not slow down frame rate relative to raw















     * sensor output.</p>















     *













     * @see CaptureRequest#TONEMAP_CURVE_BLUE













     * @see CaptureRequest#TONEMAP_CURVE_GREEN













     * @see CaptureRequest#TONEMAP_CURVE_RED













     * @see CaptureRequest#TONEMAP_CURVE















     * @see CaptureRequest#TONEMAP_MODE















     */















    public static final int TONEMAP_MODE_CONTRAST_CURVE = 0;

































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



+65
−15




























Original line number
Diff line number
Diff line








@@ -1496,10 +1496,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * <p>Tonemapping / contrast / gamma curve for the blue















     * channel, to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} is















     * CONTRAST_CURVE.</p>













     * <p>See {@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} for more details.</p>













     * <p>See android.tonemap.curveRed for more details.</p>















     *













     * @see CaptureRequest#TONEMAP_CURVE_RED















     * @see CaptureRequest#TONEMAP_MODE













     * @hide















     */















    public static final Key<float[]> TONEMAP_CURVE_BLUE =















            new Key<float[]>("android.tonemap.curveBlue", float[].class);









@@ -1508,10 +1508,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * <p>Tonemapping / contrast / gamma curve for the green















     * channel, to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} is















     * CONTRAST_CURVE.</p>













     * <p>See {@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} for more details.</p>













     * <p>See android.tonemap.curveRed for more details.</p>















     *













     * @see CaptureRequest#TONEMAP_CURVE_RED















     * @see CaptureRequest#TONEMAP_MODE













     * @hide















     */















    public static final Key<float[]> TONEMAP_CURVE_GREEN =















            new Key<float[]>("android.tonemap.curveGreen", float[].class);









@@ -1521,7 +1521,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * channel, to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} is















     * CONTRAST_CURVE.</p>















     * <p>Each channel's curve is defined by an array of control points:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} =













     * <pre><code>android.tonemap.curveRed =















     * [ P0in, P0out, P1in, P1out, P2in, P2out, P3in, P3out, ..., PNin, PNout ]















     * 2 &lt;= N &lt;= {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}</code></pre>















     * <p>These are sorted in order of increasing <code>Pin</code>; it is always









@@ -1537,15 +1537,15 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * only specify the red channel and the precision is limited to 4















     * digits, for conciseness.</p>















     * <p>Linear mapping:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} = [ 0, 0, 1.0, 1.0 ]













     * <pre><code>android.tonemap.curveRed = [ 0, 0, 1.0, 1.0 ]















     * </code></pre>















     * <p><img alt="Linear mapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png" /></p>















     * <p>Invert mapping:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} = [ 0, 1.0, 1.0, 0 ]













     * <pre><code>android.tonemap.curveRed = [ 0, 1.0, 1.0, 0 ]















     * </code></pre>















     * <p><img alt="Inverting mapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png" /></p>















     * <p>Gamma 1/2.2 mapping, with 16 control points:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} = [













     * <pre><code>android.tonemap.curveRed = [















     * 0.0000, 0.0000, 0.0667, 0.2920, 0.1333, 0.4002, 0.2000, 0.4812,















     * 0.2667, 0.5484, 0.3333, 0.6069, 0.4000, 0.6594, 0.4667, 0.7072,















     * 0.5333, 0.7515, 0.6000, 0.7928, 0.6667, 0.8317, 0.7333, 0.8685,









@@ -1553,7 +1553,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * </code></pre>















     * <p><img alt="Gamma = 1/2.2 tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png" /></p>















     * <p>Standard sRGB gamma mapping, per IEC 61966-2-1:1999, with 16 control points:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} = [













     * <pre><code>android.tonemap.curveRed = [















     * 0.0000, 0.0000, 0.0667, 0.2864, 0.1333, 0.4007, 0.2000, 0.4845,















     * 0.2667, 0.5532, 0.3333, 0.6125, 0.4000, 0.6652, 0.4667, 0.7130,















     * 0.5333, 0.7569, 0.6000, 0.7977, 0.6667, 0.8360, 0.7333, 0.8721,









@@ -1561,13 +1561,66 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * </code></pre>















     * <p><img alt="sRGB tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png" /></p>















     *













     * @see CaptureRequest#TONEMAP_CURVE_RED















     * @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS















     * @see CaptureRequest#TONEMAP_MODE













     * @hide















     */















    public static final Key<float[]> TONEMAP_CURVE_RED =















            new Key<float[]>("android.tonemap.curveRed", float[].class);





























    /**













     * <p>Tonemapping / contrast / gamma curve to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode}













     * is CONTRAST_CURVE.</p>













     * <p>The tonemapCurve consist of three curves for each of red, green, and blue













     * channels respectively. The following example uses the red channel as an













     * example. The same logic applies to green and blue channel.













     * Each channel's curve is defined by an array of control points:</p>













     * <pre><code>curveRed =













     * [ P0(in, out), P1(in, out), P2(in, out), P3(in, out), ..., PN(in, out) ]













     * 2 &lt;= N &lt;= {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}</code></pre>













     * <p>These are sorted in order of increasing <code>Pin</code>; it is always













     * guaranteed that input values 0.0 and 1.0 are included in the list to













     * define a complete mapping. For input values between control points,













     * the camera device must linearly interpolate between the control













     * points.</p>













     * <p>Each curve can have an independent number of points, and the number













     * of points can be less than max (that is, the request doesn't have to













     * always provide a curve with number of points equivalent to













     * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}).</p>













     * <p>A few examples, and their corresponding graphical mappings; these













     * only specify the red channel and the precision is limited to 4













     * digits, for conciseness.</p>













     * <p>Linear mapping:</p>













     * <pre><code>curveRed = [ (0, 0), (1.0, 1.0) ]













     * </code></pre>













     * <p><img alt="Linear mapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png" /></p>













     * <p>Invert mapping:</p>













     * <pre><code>curveRed = [ (0, 1.0), (1.0, 0) ]













     * </code></pre>













     * <p><img alt="Inverting mapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png" /></p>













     * <p>Gamma 1/2.2 mapping, with 16 control points:</p>













     * <pre><code>curveRed = [













     * (0.0000, 0.0000), (0.0667, 0.2920), (0.1333, 0.4002), (0.2000, 0.4812),













     * (0.2667, 0.5484), (0.3333, 0.6069), (0.4000, 0.6594), (0.4667, 0.7072),













     * (0.5333, 0.7515), (0.6000, 0.7928), (0.6667, 0.8317), (0.7333, 0.8685),













     * (0.8000, 0.9035), (0.8667, 0.9370), (0.9333, 0.9691), (1.0000, 1.0000) ]













     * </code></pre>













     * <p><img alt="Gamma = 1/2.2 tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png" /></p>













     * <p>Standard sRGB gamma mapping, per IEC 61966-2-1:1999, with 16 control points:</p>













     * <pre><code>curveRed = [













     * (0.0000, 0.0000), (0.0667, 0.2864), (0.1333, 0.4007), (0.2000, 0.4845),













     * (0.2667, 0.5532), (0.3333, 0.6125), (0.4000, 0.6652), (0.4667, 0.7130),













     * (0.5333, 0.7569), (0.6000, 0.7977), (0.6667, 0.8360), (0.7333, 0.8721),













     * (0.8000, 0.9063), (0.8667, 0.9389), (0.9333, 0.9701), (1.0000, 1.0000) ]













     * </code></pre>













     * <p><img alt="sRGB tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png" /></p>













     *













     * @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS













     * @see CaptureRequest#TONEMAP_MODE













     */













    public static final Key<android.hardware.camera2.params.TonemapCurve> TONEMAP_CURVE =













            new Key<android.hardware.camera2.params.TonemapCurve>("android.tonemap.curve", android.hardware.camera2.params.TonemapCurve.class);





























    /**















     * <p>High-level global contrast/gamma/tonemapping control.</p>















     * <p>When switching to an application-defined contrast curve by setting









@@ -1584,8 +1637,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * <p>This must be set to a valid mode in















     * {@link CameraCharacteristics#TONEMAP_AVAILABLE_TONE_MAP_MODES android.tonemap.availableToneMapModes}.</p>















     * <p>When using either FAST or HIGH_QUALITY, the camera device will













     * emit its own tonemap curve in {@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed},













     * {@link CaptureRequest#TONEMAP_CURVE_GREEN android.tonemap.curveGreen}, and {@link CaptureRequest#TONEMAP_CURVE_BLUE android.tonemap.curveBlue}.













     * emit its own tonemap curve in {@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}.















     * These values are always available, and as close as possible to the















     * actually used nonlinear/nonglobal transforms.</p>















     * <p>If a request is sent with CONTRAST_CURVE with the camera device's









@@ -1593,9 +1645,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>













     * roughly the same.</p>















     *















     * @see CameraCharacteristics#TONEMAP_AVAILABLE_TONE_MAP_MODES













     * @see CaptureRequest#TONEMAP_CURVE_BLUE













     * @see CaptureRequest#TONEMAP_CURVE_GREEN













     * @see CaptureRequest#TONEMAP_CURVE_RED













     * @see CaptureRequest#TONEMAP_CURVE















     * @see CaptureRequest#TONEMAP_MODE















     * @see #TONEMAP_MODE_CONTRAST_CURVE















     * @see #TONEMAP_MODE_FAST

































core/java/android/hardware/camera2/CaptureResult.java



+67
−17




























Original line number
Diff line number
Diff line








@@ -2386,8 +2386,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE















     * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE















     */













    public static final Key<int[]> STATISTICS_HOT_PIXEL_MAP =













            new Key<int[]>("android.statistics.hotPixelMap", int[].class);













    public static final Key<android.graphics.Point[]> STATISTICS_HOT_PIXEL_MAP =













            new Key<android.graphics.Point[]>("android.statistics.hotPixelMap", android.graphics.Point[].class);































    /**















     * <p>Whether the camera device will output the lens









@@ -2407,10 +2407,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * <p>Tonemapping / contrast / gamma curve for the blue















     * channel, to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} is















     * CONTRAST_CURVE.</p>













     * <p>See {@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} for more details.</p>













     * <p>See android.tonemap.curveRed for more details.</p>















     *













     * @see CaptureRequest#TONEMAP_CURVE_RED















     * @see CaptureRequest#TONEMAP_MODE













     * @hide















     */















    public static final Key<float[]> TONEMAP_CURVE_BLUE =















            new Key<float[]>("android.tonemap.curveBlue", float[].class);









@@ -2419,10 +2419,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * <p>Tonemapping / contrast / gamma curve for the green















     * channel, to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} is















     * CONTRAST_CURVE.</p>













     * <p>See {@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} for more details.</p>













     * <p>See android.tonemap.curveRed for more details.</p>















     *













     * @see CaptureRequest#TONEMAP_CURVE_RED















     * @see CaptureRequest#TONEMAP_MODE













     * @hide















     */















    public static final Key<float[]> TONEMAP_CURVE_GREEN =















            new Key<float[]>("android.tonemap.curveGreen", float[].class);









@@ -2432,7 +2432,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * channel, to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode} is















     * CONTRAST_CURVE.</p>















     * <p>Each channel's curve is defined by an array of control points:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} =













     * <pre><code>android.tonemap.curveRed =















     * [ P0in, P0out, P1in, P1out, P2in, P2out, P3in, P3out, ..., PNin, PNout ]















     * 2 &lt;= N &lt;= {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}</code></pre>















     * <p>These are sorted in order of increasing <code>Pin</code>; it is always









@@ -2448,15 +2448,15 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * only specify the red channel and the precision is limited to 4















     * digits, for conciseness.</p>















     * <p>Linear mapping:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} = [ 0, 0, 1.0, 1.0 ]













     * <pre><code>android.tonemap.curveRed = [ 0, 0, 1.0, 1.0 ]















     * </code></pre>















     * <p><img alt="Linear mapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png" /></p>















     * <p>Invert mapping:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} = [ 0, 1.0, 1.0, 0 ]













     * <pre><code>android.tonemap.curveRed = [ 0, 1.0, 1.0, 0 ]















     * </code></pre>















     * <p><img alt="Inverting mapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png" /></p>















     * <p>Gamma 1/2.2 mapping, with 16 control points:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} = [













     * <pre><code>android.tonemap.curveRed = [















     * 0.0000, 0.0000, 0.0667, 0.2920, 0.1333, 0.4002, 0.2000, 0.4812,















     * 0.2667, 0.5484, 0.3333, 0.6069, 0.4000, 0.6594, 0.4667, 0.7072,















     * 0.5333, 0.7515, 0.6000, 0.7928, 0.6667, 0.8317, 0.7333, 0.8685,









@@ -2464,7 +2464,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * </code></pre>















     * <p><img alt="Gamma = 1/2.2 tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png" /></p>















     * <p>Standard sRGB gamma mapping, per IEC 61966-2-1:1999, with 16 control points:</p>













     * <pre><code>{@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed} = [













     * <pre><code>android.tonemap.curveRed = [















     * 0.0000, 0.0000, 0.0667, 0.2864, 0.1333, 0.4007, 0.2000, 0.4845,















     * 0.2667, 0.5532, 0.3333, 0.6125, 0.4000, 0.6652, 0.4667, 0.7130,















     * 0.5333, 0.7569, 0.6000, 0.7977, 0.6667, 0.8360, 0.7333, 0.8721,









@@ -2472,13 +2472,66 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * </code></pre>















     * <p><img alt="sRGB tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png" /></p>















     *













     * @see CaptureRequest#TONEMAP_CURVE_RED















     * @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS















     * @see CaptureRequest#TONEMAP_MODE













     * @hide















     */















    public static final Key<float[]> TONEMAP_CURVE_RED =















            new Key<float[]>("android.tonemap.curveRed", float[].class);





























    /**













     * <p>Tonemapping / contrast / gamma curve to use when {@link CaptureRequest#TONEMAP_MODE android.tonemap.mode}













     * is CONTRAST_CURVE.</p>













     * <p>The tonemapCurve consist of three curves for each of red, green, and blue













     * channels respectively. The following example uses the red channel as an













     * example. The same logic applies to green and blue channel.













     * Each channel's curve is defined by an array of control points:</p>













     * <pre><code>curveRed =













     * [ P0(in, out), P1(in, out), P2(in, out), P3(in, out), ..., PN(in, out) ]













     * 2 &lt;= N &lt;= {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}</code></pre>













     * <p>These are sorted in order of increasing <code>Pin</code>; it is always













     * guaranteed that input values 0.0 and 1.0 are included in the list to













     * define a complete mapping. For input values between control points,













     * the camera device must linearly interpolate between the control













     * points.</p>













     * <p>Each curve can have an independent number of points, and the number













     * of points can be less than max (that is, the request doesn't have to













     * always provide a curve with number of points equivalent to













     * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}).</p>













     * <p>A few examples, and their corresponding graphical mappings; these













     * only specify the red channel and the precision is limited to 4













     * digits, for conciseness.</p>













     * <p>Linear mapping:</p>













     * <pre><code>curveRed = [ (0, 0), (1.0, 1.0) ]













     * </code></pre>













     * <p><img alt="Linear mapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png" /></p>













     * <p>Invert mapping:</p>













     * <pre><code>curveRed = [ (0, 1.0), (1.0, 0) ]













     * </code></pre>













     * <p><img alt="Inverting mapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png" /></p>













     * <p>Gamma 1/2.2 mapping, with 16 control points:</p>













     * <pre><code>curveRed = [













     * (0.0000, 0.0000), (0.0667, 0.2920), (0.1333, 0.4002), (0.2000, 0.4812),













     * (0.2667, 0.5484), (0.3333, 0.6069), (0.4000, 0.6594), (0.4667, 0.7072),













     * (0.5333, 0.7515), (0.6000, 0.7928), (0.6667, 0.8317), (0.7333, 0.8685),













     * (0.8000, 0.9035), (0.8667, 0.9370), (0.9333, 0.9691), (1.0000, 1.0000) ]













     * </code></pre>













     * <p><img alt="Gamma = 1/2.2 tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png" /></p>













     * <p>Standard sRGB gamma mapping, per IEC 61966-2-1:1999, with 16 control points:</p>













     * <pre><code>curveRed = [













     * (0.0000, 0.0000), (0.0667, 0.2864), (0.1333, 0.4007), (0.2000, 0.4845),













     * (0.2667, 0.5532), (0.3333, 0.6125), (0.4000, 0.6652), (0.4667, 0.7130),













     * (0.5333, 0.7569), (0.6000, 0.7977), (0.6667, 0.8360), (0.7333, 0.8721),













     * (0.8000, 0.9063), (0.8667, 0.9389), (0.9333, 0.9701), (1.0000, 1.0000) ]













     * </code></pre>













     * <p><img alt="sRGB tonemapping curve" src="../../../../images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png" /></p>













     *













     * @see CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS













     * @see CaptureRequest#TONEMAP_MODE













     */













    public static final Key<android.hardware.camera2.params.TonemapCurve> TONEMAP_CURVE =













            new Key<android.hardware.camera2.params.TonemapCurve>("android.tonemap.curve", android.hardware.camera2.params.TonemapCurve.class);





























    /**















     * <p>High-level global contrast/gamma/tonemapping control.</p>















     * <p>When switching to an application-defined contrast curve by setting









@@ -2495,8 +2548,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * <p>This must be set to a valid mode in















     * {@link CameraCharacteristics#TONEMAP_AVAILABLE_TONE_MAP_MODES android.tonemap.availableToneMapModes}.</p>















     * <p>When using either FAST or HIGH_QUALITY, the camera device will













     * emit its own tonemap curve in {@link CaptureRequest#TONEMAP_CURVE_RED android.tonemap.curveRed},













     * {@link CaptureRequest#TONEMAP_CURVE_GREEN android.tonemap.curveGreen}, and {@link CaptureRequest#TONEMAP_CURVE_BLUE android.tonemap.curveBlue}.













     * emit its own tonemap curve in {@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}.















     * These values are always available, and as close as possible to the















     * actually used nonlinear/nonglobal transforms.</p>















     * <p>If a request is sent with CONTRAST_CURVE with the camera device's









@@ -2504,9 +2556,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {













     * roughly the same.</p>















     *















     * @see CameraCharacteristics#TONEMAP_AVAILABLE_TONE_MAP_MODES













     * @see CaptureRequest#TONEMAP_CURVE_BLUE













     * @see CaptureRequest#TONEMAP_CURVE_GREEN













     * @see CaptureRequest#TONEMAP_CURVE_RED













     * @see CaptureRequest#TONEMAP_CURVE















     * @see CaptureRequest#TONEMAP_MODE















     * @see #TONEMAP_MODE_CONTRAST_CURVE















     * @see #TONEMAP_MODE_FAST