diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-12-04 23:54:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-04 23:54:05 +0000 |
| commit | 69c5e7143dd308e8db9b6055b428b7ad3964c1ff (patch) | |
| tree | 16a9d9af64abbb66f186404107370d284fb7b47c /core/java/android/hardware/camera2 | |
| parent | 0a887bcd5c5a8056735d221ad71afcff1f6eb1a6 (diff) | |
| parent | 5fdf0a1af0da0e0ab7dd679b27bd5f336c52c249 (diff) | |
| download | frameworks_base-69c5e7143dd308e8db9b6055b428b7ad3964c1ff.zip frameworks_base-69c5e7143dd308e8db9b6055b428b7ad3964c1ff.tar.gz frameworks_base-69c5e7143dd308e8db9b6055b428b7ad3964c1ff.tar.bz2 | |
Merge "Camera: codegen doc update" into mnc-dev
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index a2ef078..7464211 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -398,17 +398,24 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * this camera device.</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 + * <li> + * <p>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}, * {@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> <= 15 and <code>max</code> >= 30.</li> + * always include (<code>x</code>,<code>x</code>).</p> + * </li> + * <li> + * <p>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} <code>x</code> >= 24.</p> + * </li> * </ul> * <p>For devices at the LIMITED level or above:</p> * <ul> |