From 5855162f80afa39b6fe5e52eddf91613fd6da067 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Thu, 21 May 2015 11:27:06 -0700
Subject: [PATCH] Camera2: update FpsRange requirement

Codegen doc update only.

Bug:13639914
Change-Id: Id8a4a237c409725831a65b4f134422cd261cad52
---
 .../camera2/CameraCharacteristics.java        | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java
index d3b63f9d0f14a..7874c280888af 100644
--- a/core/java/android/hardware/camera2/CameraCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraCharacteristics.java
@@ -375,8 +375,26 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
     /**
      * <p>List of frame rate ranges for {@link CaptureRequest#CONTROL_AE_TARGET_FPS_RANGE android.control.aeTargetFpsRange} supported by
      * this camera device.</p>
-     * <p>For devices at the LIMITED level or above, this list will include at least (30, 30) for
-     * constant-framerate recording.</p>
+     * <p>For devices at the LEGACY level or above:</p>
+     * <ul>
+     * <li>This list will always include (30, 30).</li>
+     * <li>Also, for constant-framerate recording, for each normal
+     * {@link android.media.CamcorderProfile CamcorderProfile} that has
+     * {@link android.media.CamcorderProfile#quality quality} in
+     * the range [{@link android.media.CamcorderProfile#QUALITY_LOW QUALITY_LOW},
+     * {@link android.media.CamcorderProfile#QUALITY_2160P QUALITY_2160P}], if the profile is
+     * supported by the device and has
+     * {@link android.media.CamcorderProfile#videoFrameRate videoFrameRate} <code>x</code>, this list will
+     * always include (<code>x</code>,<code>x</code>).</li>
+     * <li>For preview streaming use case, this list will always include (<code>min</code>, <code>max</code>) where
+     * <code>min</code> &lt;= 15 and <code>max</code> &gt;= 30.</li>
+     * </ul>
+     * <p>For devices at the LIMITED level or above:</p>
+     * <ul>
+     * <li>For YUV_420_888 burst capture use case, this list will always include (<code>min</code>, <code>max</code>)
+     * and (<code>max</code>, <code>max</code>) where <code>min</code> &lt;= 15 and <code>max</code> = the maximum output frame rate of the
+     * maximum YUV_420_888 output size.</li>
+     * </ul>
      * <p><b>Units</b>: Frames per second (FPS)</p>
      * <p>This key is available on all devices.</p>
      *