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

Commit 9c9167ef authored by Chien-Yu Chen's avatar Chien-Yu Chen
Browse files

Camera2: Update FAST mode for EE and NR 

FAST for EE/NR modes may be the same as OFF for devices
whose EE/NR will slow down the capture rate.

Bug: 22486061
Change-Id: I162dc27a6ba6838fbbc1077dd346f4ff9bbacc43
parent 0f69b465

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

+5 −3
Original line number Diff line number Diff line
@@ -1994,8 +1994,9 @@ public abstract class CameraMetadata<TKey> { 
    public static final int EDGE_MODE_OFF = 0;



    /**

     * <p>Apply edge enhancement at a quality level that does not slow down frame rate relative to sensor

     * output</p>

     * <p>Apply edge enhancement at a quality level that does not slow down frame rate

     * relative to sensor output. It may be the same as OFF if edge enhancement will

     * slow down frame rate relative to sensor.</p>

     * @see CaptureRequest#EDGE_MODE

     */

    public static final int EDGE_MODE_FAST = 1;
@@ -2117,7 +2118,8 @@ public abstract class CameraMetadata<TKey> { 


    /**

     * <p>Noise reduction is applied without reducing frame rate relative to sensor

     * output.</p>

     * output. It may be the same as OFF if noise reduction will reduce frame rate

     * relative to sensor.</p>

     * @see CaptureRequest#NOISE_REDUCTION_MODE

     */

    public static final int NOISE_REDUCTION_MODE_FAST = 1;

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

+7 −5
Original line number Diff line number Diff line
@@ -1584,8 +1584,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * will be applied. HIGH_QUALITY mode indicates that the

     * camera device will use the highest-quality enhancement algorithms,

     * even if it slows down capture rate. FAST means the camera device will

     * not slow down capture rate when applying edge enhancement. Every output stream will

     * have a similar amount of enhancement applied.</p>

     * not slow down capture rate when applying edge enhancement. FAST may be the same as OFF if

     * edge enhancement will slow down capture rate. Every output stream will have a similar

     * amount of enhancement applied.</p>

     * <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular

     * buffer of high-resolution images during preview and reprocess image(s) from that buffer

     * into a final capture when triggered by the user. In this mode, the camera device applies
@@ -1594,7 +1595,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * since those will be reprocessed later if necessary.</p>

     * <p>For YUV_REPROCESSING, these FAST/HIGH_QUALITY modes both mean that the camera

     * device will apply FAST/HIGH_QUALITY YUV-domain edge enhancement, respectively.

     * The camera device may adjust its internal noise reduction parameters for best

     * The camera device may adjust its internal edge enhancement parameters for best

     * image quality based on the {@link CaptureRequest#REPROCESS_EFFECTIVE_EXPOSURE_FACTOR android.reprocess.effectiveExposureFactor}, if it is set.</p>

     * <p><b>Possible values:</b>

     * <ul>
@@ -2003,8 +2004,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * will be applied. HIGH_QUALITY mode indicates that the camera device

     * will use the highest-quality noise filtering algorithms,

     * even if it slows down capture rate. FAST means the camera device will not

     * slow down capture rate when applying noise filtering. Every output stream will

     * have a similar amount of enhancement applied.</p>

     * slow down capture rate when applying noise filtering. FAST may be the same as MINIMAL if

     * MINIMAL is listed, or the same as OFF if any noise filtering will slow down capture rate.

     * Every output stream will have a similar amount of enhancement applied.</p>

     * <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular

     * buffer of high-resolution images during preview and reprocess image(s) from that buffer

     * into a final capture when triggered by the user. In this mode, the camera device applies

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

+7 −5
Original line number Diff line number Diff line
@@ -2095,8 +2095,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * will be applied. HIGH_QUALITY mode indicates that the

     * camera device will use the highest-quality enhancement algorithms,

     * even if it slows down capture rate. FAST means the camera device will

     * not slow down capture rate when applying edge enhancement. Every output stream will

     * have a similar amount of enhancement applied.</p>

     * not slow down capture rate when applying edge enhancement. FAST may be the same as OFF if

     * edge enhancement will slow down capture rate. Every output stream will have a similar

     * amount of enhancement applied.</p>

     * <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular

     * buffer of high-resolution images during preview and reprocess image(s) from that buffer

     * into a final capture when triggered by the user. In this mode, the camera device applies
@@ -2105,7 +2106,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * since those will be reprocessed later if necessary.</p>

     * <p>For YUV_REPROCESSING, these FAST/HIGH_QUALITY modes both mean that the camera

     * device will apply FAST/HIGH_QUALITY YUV-domain edge enhancement, respectively.

     * The camera device may adjust its internal noise reduction parameters for best

     * The camera device may adjust its internal edge enhancement parameters for best

     * image quality based on the {@link CaptureRequest#REPROCESS_EFFECTIVE_EXPOSURE_FACTOR android.reprocess.effectiveExposureFactor}, if it is set.</p>

     * <p><b>Possible values:</b>

     * <ul>
@@ -2786,8 +2787,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * will be applied. HIGH_QUALITY mode indicates that the camera device

     * will use the highest-quality noise filtering algorithms,

     * even if it slows down capture rate. FAST means the camera device will not

     * slow down capture rate when applying noise filtering. Every output stream will

     * have a similar amount of enhancement applied.</p>

     * slow down capture rate when applying noise filtering. FAST may be the same as MINIMAL if

     * MINIMAL is listed, or the same as OFF if any noise filtering will slow down capture rate.

     * Every output stream will have a similar amount of enhancement applied.</p>

     * <p>ZERO_SHUTTER_LAG is meant to be used by applications that maintain a continuous circular

     * buffer of high-resolution images during preview and reprocess image(s) from that buffer

     * into a final capture when triggered by the user. In this mode, the camera device applies