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

Commit 361d5203 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android Git Automerger
Browse files

am c8984961: am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce... 

am c8984961: am 73d7cfea: am be0a7a0d: am 3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev

* commit 'c8984961':
  Camera: Enforce ZERO_SHUTTER_LAG mode
parents b8fb1343 c8984961

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

+5 −1
Original line number Diff line number Diff line
@@ -738,7 +738,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    /**

     * <p>List of edge enhancement modes for {@link CaptureRequest#EDGE_MODE android.edge.mode} that are supported by this camera

     * device.</p>

     * <p>Full-capability camera devices must always support OFF; all devices will list FAST.</p>

     * <p>Full-capability camera devices must always support OFF; camera devices that support

     * YUV_REPROCESSING or PRIVATE_REPROCESSING will list ZERO_SHUTTER_LAG; all devices will

     * list FAST.</p>

     * <p><b>Range of valid values:</b><br>

     * Any value listed in {@link CaptureRequest#EDGE_MODE android.edge.mode}</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
@@ -1176,6 +1178,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>List of noise reduction modes for {@link CaptureRequest#NOISE_REDUCTION_MODE android.noiseReduction.mode} that are supported

     * by this camera device.</p>

     * <p>Full-capability camera devices will always support OFF and FAST.</p>

     * <p>Camera devices that support YUV_REPROCESSING or PRIVATE_REPROCESSING will support

     * ZERO_SHUTTER_LAG.</p>

     * <p>Legacy-capability camera devices will only support FAST mode.</p>

     * <p><b>Range of valid values:</b><br>

     * Any value listed in {@link CaptureRequest#NOISE_REDUCTION_MODE android.noiseReduction.mode}</p>

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

+4 −2
Original line number Diff line number Diff line
@@ -2024,7 +2024,8 @@ public abstract class CameraMetadata<TKey> { 
     * reasonable preview quality.</p>

     * <p>This mode is guaranteed to be supported by devices that support either the

     * YUV_REPROCESSING or PRIVATE_REPROCESSING capabilities

     * ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} lists either of those capabilities).</p>

     * ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} lists either of those capabilities) and it will

     * be the default mode for CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.</p>

     *

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     * @see CaptureRequest#EDGE_MODE
@@ -2154,7 +2155,8 @@ public abstract class CameraMetadata<TKey> { 
     * applied for reasonable preview quality.</p>

     * <p>This mode is guaranteed to be supported by devices that support either the

     * YUV_REPROCESSING or PRIVATE_REPROCESSING capabilities

     * ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} lists either of those capabilities).</p>

     * ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} lists either of those capabilities) and it will

     * be the default mode for CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.</p>

     *

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     * @see CaptureRequest#NOISE_REDUCTION_MODE