From 4b466e74e79c5ec6f3ea455ae5479484dd550ee5 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Tue, 23 Jun 2015 07:59:24 -0700 Subject: camera_metadata: fix typo in high speed metadata Bug: 21442271 Change-Id: I3052d99213ed5dbdc27f7f39f8cec92caeeefdc2 --- camera/docs/docs.html | 2 +- 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, in the format of (width, height, -

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 StreamConfigurationMap#getOutputSizes 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 >= 120fps.

- 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} -- cgit v1.2.3