summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-05-08 22:26:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-08 22:26:50 +0000
commit5da5ad056cbe099529681e19791e19fe9d0a01c9 (patch)
treee6602556d2ff94d147eb35ae066443cc4cea4084
parent0b47c6ef73b7ca796b506c9b3feb50343863ce9c (diff)
parent853e0dd3a0dad2e5ff6b615c82ed74f4cab46b98 (diff)
downloadandroid_system_media-5da5ad056cbe099529681e19791e19fe9d0a01c9.tar.gz
android_system_media-5da5ad056cbe099529681e19791e19fe9d0a01c9.tar.bz2
android_system_media-5da5ad056cbe099529681e19791e19fe9d0a01c9.zip
Merge "camera: Clarify ZSL supports" into oc-dev
-rw-r--r--camera/docs/docs.html2
-rw-r--r--camera/docs/metadata_properties.xml2
-rw-r--r--camera/docs/ndk_metadata_properties.xml2
3 files changed, 6 insertions, 0 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 96a16e48..e8613126 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -4300,6 +4300,7 @@ TEMPLATE_<wbr/>STILL_<wbr/>CAPTURE template may be <code>true</code>.<wbr/> The
<code>false</code> if present.<wbr/></p>
<p>For applications targeting SDK versions older than O,<wbr/> the value of enableZsl in all
capture templates is always <code>false</code> if present.<wbr/></p>
+<p>For application-operated ZSL,<wbr/> use CAMERA3_<wbr/>TEMPLATE_<wbr/>ZERO_<wbr/>SHUTTER_<wbr/>LAG template.<wbr/></p>
</td>
</tr>
@@ -9032,6 +9033,7 @@ TEMPLATE_<wbr/>STILL_<wbr/>CAPTURE template may be <code>true</code>.<wbr/> The
<code>false</code> if present.<wbr/></p>
<p>For applications targeting SDK versions older than O,<wbr/> the value of enableZsl in all
capture templates is always <code>false</code> if present.<wbr/></p>
+<p>For application-operated ZSL,<wbr/> use CAMERA3_<wbr/>TEMPLATE_<wbr/>ZERO_<wbr/>SHUTTER_<wbr/>LAG template.<wbr/></p>
</td>
</tr>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index f2fa1a83..f800efe9 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -2831,6 +2831,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
For applications targeting SDK versions older than O, the value of enableZsl in all
capture templates is always `false` if present.
+
+ For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.
</details>
<hal_details>
It is valid for HAL to produce regular output images for requests with STILL_CAPTURE
diff --git a/camera/docs/ndk_metadata_properties.xml b/camera/docs/ndk_metadata_properties.xml
index 6eb95f79..cb346f36 100644
--- a/camera/docs/ndk_metadata_properties.xml
+++ b/camera/docs/ndk_metadata_properties.xml
@@ -2849,6 +2849,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
For applications targeting SDK versions older than O, the value of enableZsl in all
capture templates is always `false` if present.
+
+ For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.
</details>
<hal_details>
It is valid for HAL to produce regular output images for requests with STILL_CAPTURE