diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-04-28 17:56:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-28 17:56:01 +0000 |
| commit | c7d9bef9f539d12476234aec040fe564b589b7ad (patch) | |
| tree | 5bbc41a89a13c098f4ff523655a3165cb1bb77de /camera | |
| parent | 5137915ee66b05cfaa2faa1b9d9f46abaa7033a7 (diff) | |
| parent | fa2a8671c1253f8bb5f0bd34accf4154ac15a90f (diff) | |
| download | android_system_media-c7d9bef9f539d12476234aec040fe564b589b7ad.tar.gz android_system_media-c7d9bef9f539d12476234aec040fe564b589b7ad.tar.bz2 android_system_media-c7d9bef9f539d12476234aec040fe564b589b7ad.zip | |
Merge "Camera: document required template for capability" into mnc-dev
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/docs/docs.html | 5 | ||||
| -rw-r--r-- | camera/docs/metadata_properties.xml | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index f4bf33e7..384ab7ac 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -15070,6 +15070,11 @@ the result.<wbr/></p> <a href="#static_android.scaler.availableMinFrameDurations">android.<wbr/>scaler.<wbr/>available<wbr/>Min<wbr/>Frame<wbr/>Durations</a> static property entirely.<wbr/></p> <p>For OPAQUE_<wbr/>REPROCESSING and YUV_<wbr/>REPROCESSING capabilities,<wbr/> see hardware/<wbr/>libhardware/<wbr/>include/<wbr/>hardware/<wbr/>camera3.<wbr/>h Section 10 for more information.<wbr/></p> +<p>Devices that support the MANUAL_<wbr/>SENSOR capability must support the +CAMERA3_<wbr/>TEMPLATE_<wbr/>MANUAL template defined in camera3.<wbr/>h.<wbr/></p> +<p>Devices that support the OPAQUE_<wbr/>REPROCESSING capability or the +YUV_<wbr/>REPROCESSING capability must support the +CAMERA3_<wbr/>TEMPLATE_<wbr/>ZERO_<wbr/>SHUTTER_<wbr/>LAG template defined in camera3.<wbr/>h.<wbr/></p> <p>For DEPTH_<wbr/>OUTPUT,<wbr/> the depth-format keys <a href="#static_android.depth.availableDepthStreamConfigurations">android.<wbr/>depth.<wbr/>available<wbr/>Depth<wbr/>Stream<wbr/>Configurations</a>,<wbr/> <a href="#static_android.depth.availableDepthMinFrameDurations">android.<wbr/>depth.<wbr/>available<wbr/>Depth<wbr/>Min<wbr/>Frame<wbr/>Durations</a>,<wbr/> diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index f39d7be6..023c2331 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -4491,6 +4491,13 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata For OPAQUE_REPROCESSING and YUV_REPROCESSING capabilities, see hardware/libhardware/include/hardware/camera3.h Section 10 for more information. + Devices that support the MANUAL_SENSOR capability must support the + CAMERA3_TEMPLATE_MANUAL template defined in camera3.h. + + Devices that support the OPAQUE_REPROCESSING capability or the + YUV_REPROCESSING capability must support the + CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template defined in camera3.h. + For DEPTH_OUTPUT, the depth-format keys android.depth.availableDepthStreamConfigurations, android.depth.availableDepthMinFrameDurations, |