commit df84cb90df6f4a98c853dd61e858f62a584cdac5
author Eino-Ville Talvala <etalvala@google.com> Thu Nov 20 22:03:06 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 20 22:03:07 2014 +0000
tree e290511c92012be885e021e1d792574da75c64e0
parent 09ff91255e945f2588c377614bf7b7c0d512118e
parent 8d709f3d5381795cdad942f64b9441d54e48d774

Merge "Camera: Add one more requirement to BURST_CAPTURE" into lmp-mr1-dev

core/java/android/hardware/camera2/CameraMetadata.java

diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java
index 271fc30..895ae04 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -490,12 +490,16 @@
      * <p>More specifically, this means that a size matching the
      * camera device's active array size is listed as a
      * supported size for the YUV_420_888 format in
-     * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP android.scaler.streamConfigurationMap}, and the
-     * minimum frame duration for that format and size is &lt;=
-     * 1/20 s.</p>
+     * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP android.scaler.streamConfigurationMap}, the minimum frame
+     * duration for that format and size is &lt;= 1/20 s, and
+     * the {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES android.control.aeAvailableTargetFpsRanges} entry
+     * lists at least one FPS range where the minimum FPS
+     * is &gt;= 1 / minimumFrameDuration for the maximum-size
+     * YUV_420_888 format.</p>
      * <p>In addition, the {@link CameraCharacteristics#SYNC_MAX_LATENCY android.sync.maxLatency} field is
      * guaranted to have a value between 0 and 4, inclusive.</p>
      *
+     * @see CameraCharacteristics#CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES
      * @see CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP
      * @see CameraCharacteristics#SYNC_MAX_LATENCY
      * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES