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

Commit 0ed25174 authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Update java doc for tone.map.curveRed key"

parents 60450ddb 870922be

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

+1 −1
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
     * <p>Each channel's curve is defined by an array of control points:</p>

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

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ public final class CaptureResult extends CameraMetadata { 
     * <p>Each channel's curve is defined by an array of control points:</p>

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

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

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

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