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

Commit 32e9dd70 authored Oct 02, 2023 by Shuzhen Wang Committed by Automerger Merge Worker Oct 02, 2023

Merge "Camera: Clarify interaction between fpsRange and minFrameDuration" into...

Merge "Camera: Clarify interaction between fpsRange and minFrameDuration" into udc-dev am: e76f375d am: 648249c3

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

Change-Id: Idca93b407dea0a3a6e7db7985befc7edf8579868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 59b7f80d 648249c3

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -1471,6 +1471,12 @@ 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>Note that the actual achievable max framerate also depends on the minimum frame
		* duration of the output streams. The max frame rate will be
		* <code>min(aeTargetFpsRange.maxFps, 1 / max(individual stream min durations)</code>. For example,
		* if the application sets this key to <code>{60, 60}</code>, but the maximum minFrameDuration among
		* all configured streams is 33ms, the maximum framerate won't be 60fps, but will be
		* 30fps.</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

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -890,6 +890,12 @@ 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>Note that the actual achievable max framerate also depends on the minimum frame
		* duration of the output streams. The max frame rate will be
		* <code>min(aeTargetFpsRange.maxFps, 1 / max(individual stream min durations)</code>. For example,
		* if the application sets this key to <code>{60, 60}</code>, but the maximum minFrameDuration among
		* all configured streams is 33ms, the maximum framerate won't be 60fps, but will be
		* 30fps.</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