diff options
4 files changed, 25 insertions, 8 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index adc3a1eea39e..5460bc107975 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -329,8 +329,13 @@ public final class CameraCharacteristics extends CameraMetadata { new Key<float[]>("android.lens.info.availableFocalLengths", float[].class); /** - * <p>List of supported optical image - * stabilization modes</p> + * <p>List containing a subset of the optical image + * stabilization (OIS) modes specified in + * {@link CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE android.lens.opticalStabilizationMode}.</p> + * <p>If OIS is not implemented for a given camera device, this should + * contain only OFF.</p> + * + * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE */ public static final Key<byte[]> LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION = new Key<byte[]>("android.lens.info.availableOpticalStabilization", byte[].class); diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index e9d794b83897..157347600b5a 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -927,11 +927,13 @@ public abstract class CameraMetadata { // /** + * <p>Optical stabilization is unavailable.</p> * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE */ public static final int LENS_OPTICAL_STABILIZATION_MODE_OFF = 0; /** + * <p>Optical stabilization is enabled.</p> * @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE */ public static final int LENS_OPTICAL_STABILIZATION_MODE_ON = 1; diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 176132b68296..530b922feb5e 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -964,9 +964,14 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable { new Key<Float>("android.lens.focusDistance", float.class); /** - * <p>Whether optical image stabilization is - * enabled.</p> - * <p>Will not be supported on most devices.</p> + * <p>Sets whether the camera device uses optical image stabilization (OIS) + * when capturing images.</p> + * <p>OIS is used to compensate for motion blur due to small movements of + * the camera during capture. Unlike digital image stabilization, OIS makes + * use of mechanical elements to stabilize the camera sensor, and thus + * allows for longer exposure times before camera shake becomes + * apparent.</p> + * <p>This is not expected to be supported on most devices.</p> * @see #LENS_OPTICAL_STABILIZATION_MODE_OFF * @see #LENS_OPTICAL_STABILIZATION_MODE_ON */ diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 923726742d8a..7303502a4d2c 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -1133,9 +1133,14 @@ public final class CaptureResult extends CameraMetadata { new Key<float[]>("android.lens.focusRange", float[].class); /** - * <p>Whether optical image stabilization is - * enabled.</p> - * <p>Will not be supported on most devices.</p> + * <p>Sets whether the camera device uses optical image stabilization (OIS) + * when capturing images.</p> + * <p>OIS is used to compensate for motion blur due to small movements of + * the camera during capture. Unlike digital image stabilization, OIS makes + * use of mechanical elements to stabilize the camera sensor, and thus + * allows for longer exposure times before camera shake becomes + * apparent.</p> + * <p>This is not expected to be supported on most devices.</p> * @see #LENS_OPTICAL_STABILIZATION_MODE_OFF * @see #LENS_OPTICAL_STABILIZATION_MODE_ON */ |