diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-06-23 07:59:24 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2015-06-23 07:59:24 -0700 |
| commit | 4b466e74e79c5ec6f3ea455ae5479484dd550ee5 (patch) | |
| tree | 2708a8b632eed32b388f9fe3730afda260826ab2 | |
| parent | a92c2b779783170a02035fa18f01023c3410b4df (diff) | |
| download | android_system_media-4b466e74e79c5ec6f3ea455ae5479484dd550ee5.tar.gz android_system_media-4b466e74e79c5ec6f3ea455ae5479484dd550ee5.tar.bz2 android_system_media-4b466e74e79c5ec6f3ea455ae5479484dd550ee5.zip | |
camera_metadata: fix typo in high speed metadata
Bug: 21442271
Change-Id: I3052d99213ed5dbdc27f7f39f8cec92caeeefdc2
| -rw-r--r-- | camera/docs/docs.html | 2 | ||||
| -rw-r--r-- | camera/docs/metadata_properties.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index ebc5fcf7..b3972ad4 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -5094,7 +5094,7 @@ supported by the camera device,<wbr/> in the format of (width,<wbr/> height,<wbr </tr> <tr class="entry_cont"> <td class="entry_details" colspan="5"> - <p>When CONSTRAINED_<wbr/>HIGH_<wbr/>SPEED_<wbr/>VIDEO is supported in android.<wbr/>control.<wbr/>available<wbr/>Capabilities,<wbr/> + <p>When CONSTRAINED_<wbr/>HIGH_<wbr/>SPEED_<wbr/>VIDEO is supported in <a href="#static_android.request.availableCapabilities">android.<wbr/>request.<wbr/>available<wbr/>Capabilities</a>,<wbr/> this metadata will list the supported high speed video size,<wbr/> fps range and max batch size configurations.<wbr/> All the sizes listed in this configuration will be a subset of the sizes reported by <a href="https://developer.android.com/reference/android/hardware/camera2/params/StreamConfigurationMap.html#getOutputSizes">StreamConfigurationMap#getOutputSizes</a> diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index a42e47b0..10845759 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -2547,7 +2547,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata For each configuration, the fps_max &gt;= 120fps. </range> <details> - When CONSTRAINED_HIGH_SPEED_VIDEO is supported in android.control.availableCapabilities, + When CONSTRAINED_HIGH_SPEED_VIDEO is supported in android.request.availableCapabilities, this metadata will list the supported high speed video size, fps range and max batch size configurations. All the sizes listed in this configuration will be a subset of the sizes reported by {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputSizes} |