From 206bf4de57f9d85cfacbb8d919fd6960d3573be7 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Fri, 20 Nov 2015 15:16:05 -0800
Subject: [PATCH] Camera: update FPS range spec

Bug: 25427163
Change-Id: Id020b051f0ee082f9883f9a73fa3ac34540c0cfc
---
 camera/docs/docs.html               | 17 ++++++++++++-----
 camera/docs/metadata_properties.xml | 12 ++++++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 73629e67..06249ca4 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -4325,17 +4325,24 @@ this camera device.<wbr/></p>
             <td class="entry_details" colspan="5">
               <p>For devices at the LEGACY level or above:</p>
 <ul>
-<li>This list will always include (30,<wbr/> 30).<wbr/></li>
-<li>Also,<wbr/> for constant-framerate recording,<wbr/> for each normal
+<li>
+<p>For constant-framerate recording,<wbr/> for each normal
+<a href="https://developer.android.com/reference/android/media/CamcorderProfile.html">CamcorderProfile</a>,<wbr/> that is,<wbr/> a
 <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html">CamcorderProfile</a> that has
 <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#quality">quality</a> in
 the range [<a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#QUALITY_LOW">QUALITY_<wbr/>LOW</a>,<wbr/>
 <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#QUALITY_2160P">QUALITY_<wbr/>2160P</a>],<wbr/> if the profile is
 supported by the device and has
 <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#videoFrameRate">videoFrameRate</a> <code>x</code>,<wbr/> this list will
-always include (<code>x</code>,<wbr/><code>x</code>).<wbr/></li>
-<li>For preview streaming use case,<wbr/> this list will always include (<code>min</code>,<wbr/> <code>max</code>) where
-<code>min</code> &lt;= 15 and <code>max</code> &gt;= 30.<wbr/></li>
+always include (<code>x</code>,<wbr/><code>x</code>).<wbr/></p>
+</li>
+<li>
+<p>Also,<wbr/> a camera device must either not support any
+<a href="https://developer.android.com/reference/android/media/CamcorderProfile.html">CamcorderProfile</a>,<wbr/>
+or support at least one
+normal <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html">CamcorderProfile</a> that has
+<a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#videoFrameRate">videoFrameRate</a> <code>x</code> &gt;= 24.<wbr/></p>
+</li>
 </ul>
 <p>For devices at the LIMITED level or above:</p>
 <ul>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 6cf4dcc6..ce9305a6 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -1885,8 +1885,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <details>
           For devices at the LEGACY level or above:
 
-          * This list will always include (30, 30).
-          * Also, for constant-framerate recording, for each normal
+          * For constant-framerate recording, for each normal
+          {@link android.media.CamcorderProfile CamcorderProfile}, that is, a
           {@link android.media.CamcorderProfile CamcorderProfile} that has
           {@link android.media.CamcorderProfile#quality quality} in
           the range [{@link android.media.CamcorderProfile#QUALITY_LOW QUALITY_LOW},
@@ -1894,8 +1894,12 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           supported by the device and has
           {@link android.media.CamcorderProfile#videoFrameRate videoFrameRate} `x`, this list will
           always include (`x`,`x`).
-          * For preview streaming use case, this list will always include (`min`, `max`) where
-          `min` &lt;= 15 and `max` &gt;= 30.
+
+          * Also, a camera device must either not support any
+          {@link android.media.CamcorderProfile CamcorderProfile},
+          or support at least one
+          normal {@link android.media.CamcorderProfile CamcorderProfile} that has
+          {@link android.media.CamcorderProfile#videoFrameRate videoFrameRate} `x` &gt;= 24.
 
           For devices at the LIMITED level or above:
 
-- 
2.11.0