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

Commit 47027768 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Improve session parameter documentation" into udc-dev am: 5a2fc5fa 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24622278



Change-Id: I87dfb2009fbd379608c59774aada90645562395e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0071e507 5a2fc5fa

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

+13 −0
Original line number Diff line number Diff line
@@ -1468,6 +1468,13 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <p>Only constrains auto-exposure (AE) algorithm, not

     * manual control of {@link CaptureRequest#SENSOR_EXPOSURE_TIME android.sensor.exposureTime} and

     * {@link CaptureRequest#SENSOR_FRAME_DURATION android.sensor.frameDuration}.</p>

     * <p>To start a CaptureSession with a target FPS range different from the

     * capture request template's default value, the application

     * is strongly recommended to call

     * {@link SessionConfiguration#setSessionParameters }

     * with the target fps range before creating the capture session. The aeTargetFpsRange is

     * typically a session parameter. Specifying it at session creation time helps avoid

     * session reconfiguration delays in cases like 60fps or high speed recording.</p>

     * <p><b>Units</b>: Frames per second (FPS)</p>

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

     * Any of the entries in {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES android.control.aeAvailableTargetFpsRanges}</p>
@@ -2140,6 +2147,12 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * {@link CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE android.control.videoStabilizationMode} field will return

     * OFF if the recording output is not stabilized, or if there are no output

     * Surface types that can be stabilized.</p>

     * <p>The application is strongly recommended to call

     * {@link SessionConfiguration#setSessionParameters }

     * with the desired video stabilization mode before creating the capture session.

     * Video stabilization mode is a session parameter on many devices. Specifying

     * it at session creation time helps avoid reconfiguration delay caused by difference

     * between the default value and the first CaptureRequest.</p>

     * <p>If a camera device supports both this mode and OIS

     * ({@link CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE android.lens.opticalStabilizationMode}), turning both modes on may

     * produce undesirable interaction, so it is recommended not to enable

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

+13 −0
Original line number Diff line number Diff line
@@ -887,6 +887,13 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p>Only constrains auto-exposure (AE) algorithm, not

     * manual control of {@link CaptureRequest#SENSOR_EXPOSURE_TIME android.sensor.exposureTime} and

     * {@link CaptureRequest#SENSOR_FRAME_DURATION android.sensor.frameDuration}.</p>

     * <p>To start a CaptureSession with a target FPS range different from the

     * capture request template's default value, the application

     * is strongly recommended to call

     * {@link SessionConfiguration#setSessionParameters }

     * with the target fps range before creating the capture session. The aeTargetFpsRange is

     * typically a session parameter. Specifying it at session creation time helps avoid

     * session reconfiguration delays in cases like 60fps or high speed recording.</p>

     * <p><b>Units</b>: Frames per second (FPS)</p>

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

     * Any of the entries in {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES android.control.aeAvailableTargetFpsRanges}</p>
@@ -2365,6 +2372,12 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * {@link CaptureRequest#CONTROL_VIDEO_STABILIZATION_MODE android.control.videoStabilizationMode} field will return

     * OFF if the recording output is not stabilized, or if there are no output

     * Surface types that can be stabilized.</p>

     * <p>The application is strongly recommended to call

     * {@link SessionConfiguration#setSessionParameters }

     * with the desired video stabilization mode before creating the capture session.

     * Video stabilization mode is a session parameter on many devices. Specifying

     * it at session creation time helps avoid reconfiguration delay caused by difference

     * between the default value and the first CaptureRequest.</p>

     * <p>If a camera device supports both this mode and OIS

     * ({@link CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE android.lens.opticalStabilizationMode}), turning both modes on may

     * produce undesirable interaction, so it is recommended not to enable