diff options
| author | 2023-10-02 22:41:05 +0000 | |
|---|---|---|
| committer | 2023-10-02 22:41:05 +0000 | |
| commit | 648249c38687376e70fed2e7ec001e6d5c2abeec (patch) | |
| tree | c6432fd87554e43f454401f8ce80239c8980e328 | |
| parent | 050cb4b224cf23521dcb56d19090247d7963e9b2 (diff) | |
| parent | e76f375dda2662433c74754cdcd5b5349dc83f4b (diff) | |
Merge "Camera: Clarify interaction between fpsRange and minFrameDuration" into udc-dev am: e76f375dda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24867046
Change-Id: I358a173490f241692faa5b98cfb73ce534fd987d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 6 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 703f16553ddb..25c84e5e9c58 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -1468,6 +1468,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 diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 746648ba7ac5..986dd889520d 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -887,6 +887,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 |