diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-12-04 16:03:23 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-04 16:03:23 -0800 |
| commit | add4b91d41d3ba810b6b25c14d7c13050394f201 (patch) | |
| tree | 12e2fb6edd579998db0fa7a7eba9c92a648cf52b | |
| parent | 7c798c13a7c36f3c8877f410ecf5552e1b385805 (diff) | |
| parent | 69c5e7143dd308e8db9b6055b428b7ad3964c1ff (diff) | |
| download | frameworks_base-add4b91d41d3ba810b6b25c14d7c13050394f201.zip frameworks_base-add4b91d41d3ba810b6b25c14d7c13050394f201.tar.gz frameworks_base-add4b91d41d3ba810b6b25c14d7c13050394f201.tar.bz2 | |
Merge "Camera: codegen doc update" into mnc-dev
am: 69c5e7143d
* commit '69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
Camera: codegen doc update
| -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> |