diff options
| author | Chien-Yu Chen <cychen@google.com> | 2017-05-08 22:39:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-08 22:39:50 +0000 |
| commit | 87e19cfa9195b67f11370d91a49c949d21856a22 (patch) | |
| tree | ff2d74451a6ed76bdc8469e402a14a2509ce814e | |
| parent | 0101927159a82d56ab6815668453ace344c987d9 (diff) | |
| parent | 5da5ad056cbe099529681e19791e19fe9d0a01c9 (diff) | |
| download | android_system_media-87e19cfa9195b67f11370d91a49c949d21856a22.tar.gz android_system_media-87e19cfa9195b67f11370d91a49c949d21856a22.tar.bz2 android_system_media-87e19cfa9195b67f11370d91a49c949d21856a22.zip | |
Merge "camera: Clarify ZSL supports" into oc-dev
am: 5da5ad056c
Change-Id: I1b4b1401f4e7ba61bfd1647f93203e591c987ef4
| -rw-r--r-- | camera/docs/docs.html | 2 | ||||
| -rw-r--r-- | camera/docs/metadata_properties.xml | 2 | ||||
| -rw-r--r-- | camera/docs/ndk_metadata_properties.xml | 2 |
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 |