summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-10 19:18:20 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-10 19:18:20 +0000
commitf221977bd23a47c8edd99443ccb653761743fd57 (patch)
tree8e76fd232632aa919ac72ef4bbf44800e164de93
parent85d20fc4fa598d298bd9ef7367cdcef5cb0a2c6f (diff)
parent92e895f219d15479a5cb6b7911117898a4c4b614 (diff)
downloadmedia-aml_ads_341316030.tar.gz
Snap for 10927977 from 92e895f219d15479a5cb6b7911117898a4c4b614 to mainline-adservices-releaseaml_ads_341413000aml_ads_341316030android14-mainline-adservices-release
Change-Id: I708860b3c9c20b3fc5c3334b68ccd39f6aad5ee2
-rw-r--r--camera/docs/docs.html12
-rw-r--r--camera/docs/metadata_definitions.xml7
2 files changed, 19 insertions, 0 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 6e0e9a7c..ca2c4a29 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -3021,6 +3021,12 @@ exposure.<wbr/></p>
<p>Only constrains auto-exposure (AE) algorithm,<wbr/> not
manual control of <a href="#controls_android.sensor.exposureTime">android.<wbr/>sensor.<wbr/>exposure<wbr/>Time</a> and
<a href="#controls_android.sensor.frameDuration">android.<wbr/>sensor.<wbr/>frame<wbr/>Duration</a>.<wbr/></p>
+<p>Note that the actual achievable max framerate also depends on the minimum frame
+duration of the output streams.<wbr/> The max frame rate will be
+<code>min(aeTargetFpsRange.<wbr/>maxFps,<wbr/> 1 /<wbr/> max(individual stream min durations)</code>.<wbr/> For example,<wbr/>
+if the application sets this key to <code>{60,<wbr/> 60}</code>,<wbr/> but the maximum minFrameDuration among
+all configured streams is 33ms,<wbr/> the maximum framerate won't be 60fps,<wbr/> but will be
+30fps.<wbr/></p>
<p>To start a CaptureSession with a target FPS range different from the
capture request template's default value,<wbr/> the application
is strongly recommended to call
@@ -8297,6 +8303,12 @@ exposure.<wbr/></p>
<p>Only constrains auto-exposure (AE) algorithm,<wbr/> not
manual control of <a href="#controls_android.sensor.exposureTime">android.<wbr/>sensor.<wbr/>exposure<wbr/>Time</a> and
<a href="#controls_android.sensor.frameDuration">android.<wbr/>sensor.<wbr/>frame<wbr/>Duration</a>.<wbr/></p>
+<p>Note that the actual achievable max framerate also depends on the minimum frame
+duration of the output streams.<wbr/> The max frame rate will be
+<code>min(aeTargetFpsRange.<wbr/>maxFps,<wbr/> 1 /<wbr/> max(individual stream min durations)</code>.<wbr/> For example,<wbr/>
+if the application sets this key to <code>{60,<wbr/> 60}</code>,<wbr/> but the maximum minFrameDuration among
+all configured streams is 33ms,<wbr/> the maximum framerate won't be 60fps,<wbr/> but will be
+30fps.<wbr/></p>
<p>To start a CaptureSession with a target FPS range different from the
capture request template's default value,<wbr/> the application
is strongly recommended to call
diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index c401dc09..533c1d29 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -827,6 +827,13 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
manual control of android.sensor.exposureTime and
android.sensor.frameDuration.
+ Note that the actual achievable max framerate also depends on the minimum frame
+ duration of the output streams. The max frame rate will be
+ `min(aeTargetFpsRange.maxFps, 1 / max(individual stream min durations)`. For example,
+ if the application sets this key to `{60, 60}`, but the maximum minFrameDuration among
+ all configured streams is 33ms, the maximum framerate won't be 60fps, but will be
+ 30fps.
+
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