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

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

Merge "Camera2: Update metadata java docs"

parents 2f735d8d 2807936f

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

+4 −4
Original line number Diff line number Diff line
@@ -758,8 +758,8 @@ public abstract class CameraMetadata { 
    public static final int EDGE_MODE_OFF = 0;



    /**

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

     * bayer output</p>

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

     * output</p>

     * @see CaptureRequest#EDGE_MODE

     */

    public static final int EDGE_MODE_FAST = 1;
@@ -823,8 +823,8 @@ public abstract class CameraMetadata { 
    public static final int NOISE_REDUCTION_MODE_OFF = 0;



    /**

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

     * bayer output</p>

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

     * output</p>

     * @see CaptureRequest#NOISE_REDUCTION_MODE

     */

    public static final int NOISE_REDUCTION_MODE_FAST = 1;

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

+14 −0
Original line number Diff line number Diff line
@@ -652,6 +652,13 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
    /**

     * <p>Operation mode for edge

     * enhancement</p>

     * <p>Edge/sharpness/detail enhancement. OFF means no

     * enhancement will be applied by the HAL.</p>

     * <p>FAST/HIGH_QUALITY both mean HAL-determined enhancement

     * will be applied. HIGH_QUALITY mode indicates that the

     * HAL should use the highest-quality enhancement algorithms,

     * even if it slows down capture rate. FAST means the HAL should

     * not slow down capture rate when applying edge enhancement.</p>

     * @see #EDGE_MODE_OFF

     * @see #EDGE_MODE_FAST

     * @see #EDGE_MODE_HIGH_QUALITY
@@ -764,6 +771,13 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { 
    /**

     * <p>Mode of operation for the noise reduction

     * algorithm</p>

     * <p>Noise filtering control. OFF means no noise reduction

     * will be applied by the HAL.</p>

     * <p>FAST/HIGH_QUALITY both mean HAL-determined noise filtering

     * will be applied. HIGH_QUALITY mode indicates that the HAL

     * should use the highest-quality noise filtering algorithms,

     * even if it slows down capture rate. FAST means the HAL should not

     * slow down capture rate when applying noise filtering.</p>

     * @see #NOISE_REDUCTION_MODE_OFF

     * @see #NOISE_REDUCTION_MODE_FAST

     * @see #NOISE_REDUCTION_MODE_HIGH_QUALITY

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

+14 −0
Original line number Diff line number Diff line
@@ -348,6 +348,13 @@ public final class CaptureResult extends CameraMetadata { 
    /**

     * <p>Operation mode for edge

     * enhancement</p>

     * <p>Edge/sharpness/detail enhancement. OFF means no

     * enhancement will be applied by the HAL.</p>

     * <p>FAST/HIGH_QUALITY both mean HAL-determined enhancement

     * will be applied. HIGH_QUALITY mode indicates that the

     * HAL should use the highest-quality enhancement algorithms,

     * even if it slows down capture rate. FAST means the HAL should

     * not slow down capture rate when applying edge enhancement.</p>

     * @see #EDGE_MODE_OFF

     * @see #EDGE_MODE_FAST

     * @see #EDGE_MODE_HIGH_QUALITY
@@ -487,6 +494,13 @@ public final class CaptureResult extends CameraMetadata { 
    /**

     * <p>Mode of operation for the noise reduction

     * algorithm</p>

     * <p>Noise filtering control. OFF means no noise reduction

     * will be applied by the HAL.</p>

     * <p>FAST/HIGH_QUALITY both mean HAL-determined noise filtering

     * will be applied. HIGH_QUALITY mode indicates that the HAL

     * should use the highest-quality noise filtering algorithms,

     * even if it slows down capture rate. FAST means the HAL should not

     * slow down capture rate when applying noise filtering.</p>

     * @see #NOISE_REDUCTION_MODE_OFF

     * @see #NOISE_REDUCTION_MODE_FAST

     * @see #NOISE_REDUCTION_MODE_HIGH_QUALITY