Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: update antibanding spec" into lmp-mr1-dev

Browse Source
This commit is contained in:
Yin-Chia Yeh
2014-12-03 20:44:03 +00:00
committed by Android (Google) Code Review
parent da79c87f2e 7b2cae6cec
commit 381343088f
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/hardware/camera2/CameraCharacteristics.java
View File

@@ -337,8 +337,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
* supported by a given camera device. This field lists the * supported by a given camera device. This field lists the
* valid anti-banding modes that the application may request * valid anti-banding modes that the application may request
* for this camera device with the * for this camera device with the
* {@link CaptureRequest#CONTROL_AE_ANTIBANDING_MODE android.control.aeAntibandingMode} control. This list * {@link CaptureRequest#CONTROL_AE_ANTIBANDING_MODE android.control.aeAntibandingMode} control.</p>
* always includes AUTO.</p>
* <p><b>Range of valid values:</b><br> * <p><b>Range of valid values:</b><br>
* Any value listed in {@link CaptureRequest#CONTROL_AE_ANTIBANDING_MODE android.control.aeAntibandingMode}</p> * Any value listed in {@link CaptureRequest#CONTROL_AE_ANTIBANDING_MODE android.control.aeAntibandingMode}</p>
* <p>This key is available on all devices.</p> * <p>This key is available on all devices.</p>

9
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -493,9 +493,11 @@ public abstract class CameraMetadata<TKey> {
* {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP android.scaler.streamConfigurationMap}, the minimum frame * {@link CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP android.scaler.streamConfigurationMap}, the minimum frame
* duration for that format and size is &lt;= 1/20 s, and * 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 * the {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES android.control.aeAvailableTargetFpsRanges} entry
* lists at least one FPS range where the minimum FPS * lists at least one FPS range where the minimum FPS is</p>
* is &gt;= 1 / minimumFrameDuration for the maximum-size * <blockquote>
* <p>= 1 / minimumFrameDuration for the maximum-size
* YUV_420_888 format.</p> * YUV_420_888 format.</p>
* </blockquote>
* <p>In addition, the {@link CameraCharacteristics#SYNC_MAX_LATENCY android.sync.maxLatency} field is * <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> * guaranted to have a value between 0 and 4, inclusive.</p>
* *
@@ -847,7 +849,8 @@ public abstract class CameraMetadata<TKey> {
/** /**
* <p>The camera device will automatically adapt its * <p>The camera device will automatically adapt its
* antibanding routine to the current illumination * antibanding routine to the current illumination
* conditions. This is the default.</p> * condition. This is the default mode if AUTO is
* available on given camera device.</p>
* @see CaptureRequest#CONTROL_AE_ANTIBANDING_MODE * @see CaptureRequest#CONTROL_AE_ANTIBANDING_MODE
*/ */
public static final int CONTROL_AE_ANTIBANDING_MODE_AUTO = 3; public static final int CONTROL_AE_ANTIBANDING_MODE_AUTO = 3;

6
core/java/android/hardware/camera2/CaptureRequest.java
View File

@@ -642,8 +642,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
* options for the antibanding mode. The * options for the antibanding mode. The
* {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_ANTIBANDING_MODES android.control.aeAvailableAntibandingModes} key contains * {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_ANTIBANDING_MODES android.control.aeAvailableAntibandingModes} key contains
* the available modes for a given camera device.</p> * the available modes for a given camera device.</p>
* <p>The default mode is AUTO, which is supported by all * <p>AUTO mode is the default if it is available on given
* camera devices.</p> * camera device. When AUTO mode is not available, the
* default will be either 50HZ or 60HZ, and both 50HZ
* and 60HZ will be available.</p>
* <p>If manual exposure control is enabled (by setting * <p>If manual exposure control is enabled (by setting
* {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} or {@link CaptureRequest#CONTROL_MODE android.control.mode} to OFF), * {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} or {@link CaptureRequest#CONTROL_MODE android.control.mode} to OFF),
* then this setting has no effect, and the application must * then this setting has no effect, and the application must

6
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -493,8 +493,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
* options for the antibanding mode. The * options for the antibanding mode. The
* {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_ANTIBANDING_MODES android.control.aeAvailableAntibandingModes} key contains * {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_ANTIBANDING_MODES android.control.aeAvailableAntibandingModes} key contains
* the available modes for a given camera device.</p> * the available modes for a given camera device.</p>
* <p>The default mode is AUTO, which is supported by all * <p>AUTO mode is the default if it is available on given
* camera devices.</p> * camera device. When AUTO mode is not available, the
* default will be either 50HZ or 60HZ, and both 50HZ
* and 60HZ will be available.</p>
* <p>If manual exposure control is enabled (by setting * <p>If manual exposure control is enabled (by setting
* {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} or {@link CaptureRequest#CONTROL_MODE android.control.mode} to OFF), * {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} or {@link CaptureRequest#CONTROL_MODE android.control.mode} to OFF),
* then this setting has no effect, and the application must * then this setting has no effect, and the application must