Merge "Camera: Add support for CONTROL_ZOOM_RATIO" (f8aca7b4) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −2

Original line number	Diff line number	Diff line
		@@ -16934,7 +16934,7 @@ package android.hardware.camera2 {
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Rational> CONTROL_AE_COMPENSATION_STEP;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> CONTROL_AE_LOCK_AVAILABLE;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AF_AVAILABLE_MODES;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.CapabilityAndMaxSize[]> CONTROL_AVAILABLE_BOKEH_CAPABILITIES;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.Capability[]> CONTROL_AVAILABLE_BOKEH_CAPABILITIES;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_EFFECTS;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_MODES;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AVAILABLE_SCENE_MODES;
		@@ -16945,6 +16945,7 @@ package android.hardware.camera2 {
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AF;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AWB;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Integer>> CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Float>> CONTROL_ZOOM_RATIO_RANGE;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> DEPTH_DEPTH_IS_EXCLUSIVE;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> DISTORTION_CORRECTION_AVAILABLE_MODES;
		field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES;
		@@ -17357,6 +17358,7 @@ package android.hardware.camera2 {
		field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;
		field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_SCENE_MODE;
		field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
		field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> CONTROL_ZOOM_RATIO;
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.camera2.CaptureRequest> CREATOR;
		field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> DISTORTION_CORRECTION_MODE;
		field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> EDGE_MODE;
		@@ -17443,6 +17445,7 @@ package android.hardware.camera2 {
		field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_POST_RAW_SENSITIVITY_BOOST;
		field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_SCENE_MODE;
		field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> CONTROL_VIDEO_STABILIZATION_MODE;
		field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> CONTROL_ZOOM_RATIO;
		field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> DISTORTION_CORRECTION_MODE;
		field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EDGE_MODE;
		field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> FLASH_MODE;
		@@ -17532,9 +17535,10 @@ package android.hardware.camera2.params {
		field public static final int COUNT = 4; // 0x4
		}

		public final class CapabilityAndMaxSize {
		public final class Capability {
		method @NonNull public android.util.Size getMaxStreamingSize();
		method public int getMode();
		method @NonNull public android.util.Range<java.lang.Float> getZoomRatioRange();
		}

		public final class ColorSpaceTransform {

core/java/android/hardware/camera2/CameraCharacteristics.java

+99 −4

Original line number	Diff line number	Diff line
		@@ -1125,8 +1125,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		new Key<android.util.Range<Integer>>("android.control.postRawSensitivityBoostRange", new TypeReference<android.util.Range<Integer>>() {{ }});

		/**
		* <p>The list of bokeh modes that are supported by this camera device, and each bokeh mode's
		* maximum streaming (non-stall) size with bokeh effect.</p>
		* <p>The list of bokeh modes for {@link CaptureRequest#CONTROL_BOKEH_MODE android.control.bokehMode} that are supported by this camera
		* device, and each bokeh mode's maximum streaming (non-stall) size with bokeh effect.</p>
		* <p>For OFF mode, the camera behaves normally with no bokeh effect.</p>
		* <p>For STILL_CAPTURE mode, the maximum streaming dimension specifies the limit under which
		* bokeh is effective when capture intent is PREVIEW. Note that when capture intent is
		@@ -1148,12 +1148,86 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
		* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>
		*
		* @see CaptureRequest#CONTROL_BOKEH_MODE
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		* @hide
		*/
		public static final Key<int[]> CONTROL_AVAILABLE_BOKEH_MAX_SIZES =
		new Key<int[]>("android.control.availableBokehMaxSizes", int[].class);

		/**
		* <p>The ranges of supported zoom ratio for non-OFF {@link CaptureRequest#CONTROL_BOKEH_MODE android.control.bokehMode}.</p>
		* <p>When bokeh mode is enabled, the camera device may have limited range of zoom ratios
		* compared to when bokeh mode is disabled. This tag lists the zoom ratio ranges for all
		* supported non-OFF bokeh modes, in the same order as in
		* {@link CameraCharacteristics#CONTROL_AVAILABLE_BOKEH_CAPABILITIES android.control.availableBokehCapabilities}.</p>
		* <p>Range [1.0, 1.0] means that no zoom (optical or digital) is supported.</p>
		* <p><b>Units</b>: (minZoom, maxZoom)</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		* <p><b>Limited capability</b> -
		* Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
		* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>
		*
		* @see CameraCharacteristics#CONTROL_AVAILABLE_BOKEH_CAPABILITIES
		* @see CaptureRequest#CONTROL_BOKEH_MODE
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		* @hide
		*/
		public static final Key<float[]> CONTROL_AVAILABLE_BOKEH_ZOOM_RATIO_RANGES =
		new Key<float[]>("android.control.availableBokehZoomRatioRanges", float[].class);

		/**
		* <p>The list of bokeh modes for {@link CaptureRequest#CONTROL_BOKEH_MODE android.control.bokehMode} that are supported by
		* this camera device, and each bokeh mode's capabilities such as maximum streaming size
		* with bokeh effect, and supported zoom ratio ranges.</p>
		* <p>For OFF mode, the camera behaves normally with no bokeh effect.</p>
		* <p>For STILL_CAPTURE mode, the maximum streaming dimension specifies the limit under which
		* bokeh is effective when capture intent is PREVIEW. Note that when capture intent is
		* PREVIEW, the bokeh effect may not be as high quality compared to STILL_CAPTURE intent
		* in order to maintain reasonable frame rate. The maximum streaming dimension must be one
		* of the YUV_420_888 or PRIVATE resolutions in availableStreamConfigurations, or (0, 0)
		* if preview bokeh is not supported. If the application configures a stream larger than
		* the maximum streaming dimension, bokeh effect may not be applied for this stream for
		* PREVIEW intent.</p>
		* <p>For CONTINUOUS mode, the maximum streaming dimension specifies the limit under which
		* bokeh is effective. This dimension must be one of the YUV_420_888 or PRIVATE resolutions
		* in availableStreamConfigurations, and if the sensor maximum resolution is larger than or
		* equal to 1080p, the maximum streaming dimension must be at least 1080p. If the
		* application configures a stream with larger dimension, the stream may not have bokeh
		* effect applied.</p>
		* <p>When bokeh mode is enabled, the camera device may have limited range of zoom ratios
		* compared to when bokeh mode is disabled. availableBokehCapabilities lists the zoom
		* ranges for all supported bokeh modes. A range of (1.0, 1.0) means that no zoom
		* (optical or digital) is supported.</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		*
		* @see CaptureRequest#CONTROL_BOKEH_MODE
		*/
		@PublicKey
		@NonNull
		@SyntheticKey
		public static final Key<android.hardware.camera2.params.Capability[]> CONTROL_AVAILABLE_BOKEH_CAPABILITIES =
		new Key<android.hardware.camera2.params.Capability[]>("android.control.availableBokehCapabilities", android.hardware.camera2.params.Capability[].class);

		/**
		* <p>Minimum and maximum zoom ratios supported by this camera device.</p>
		* <p>If the camera device supports zoom-out from 1x zoom, minZoom will be less than 1.0, and
		* setting android.control.zoomRation to values less than 1.0 increases the camera's field
		* of view.</p>
		* <p><b>Units</b>: A pair of zoom ratio in floating points: (minZoom, maxZoom)</p>
		* <p><b>Range of valid values:</b><br></p>
		* <p>maxZoom >= 1.0 >= minZoom</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		* <p><b>Limited capability</b> -
		* Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
		* {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>
		*
		* @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL
		*/
		@PublicKey
		@NonNull
		public static final Key<android.hardware.camera2.params.CapabilityAndMaxSize[]> CONTROL_AVAILABLE_BOKEH_CAPABILITIES =
		new Key<android.hardware.camera2.params.CapabilityAndMaxSize[]>("android.control.availableBokehCapabilities", android.hardware.camera2.params.CapabilityAndMaxSize[].class);
		public static final Key<android.util.Range<Float>> CONTROL_ZOOM_RATIO_RANGE =
		new Key<android.util.Range<Float>>("android.control.zoomRatioRange", new TypeReference<android.util.Range<Float>>() {{ }});

		/**
		* <p>List of edge enhancement modes for {@link CaptureRequest#EDGE_MODE android.edge.mode} that are supported by this camera
		@@ -2215,11 +2289,16 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <p>Crop regions that have a width or height that is smaller
		* than this ratio allows will be rounded up to the minimum
		* allowed size by the camera device.</p>
		* <p>Starting from API level 30, when using {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} to zoom in or out,
		* the application must use {@link CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE android.control.zoomRatioRange} to query both the minimum and
		* maximum zoom ratio.</p>
		* <p><b>Units</b>: Zoom scale factor</p>
		* <p><b>Range of valid values:</b><br>
		* >=1</p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_ZOOM_RATIO
		* @see CameraCharacteristics#CONTROL_ZOOM_RATIO_RANGE
		* @see CaptureRequest#SCALER_CROP_REGION
		*/
		@PublicKey
		@@ -2667,6 +2746,21 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <p>Camera devices that support FREEFORM cropping will support any crop region that
		* is inside of the active array. The camera device will apply the same crop region and
		* return the final used crop region in capture result metadata {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}.</p>
		* <p>Starting from API level 30,</p>
		* <ul>
		* <li>If the camera device supports FREEFORM cropping, in order to do FREEFORM cropping, the
		* application must set {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} to 1.0, and use {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}
		* for zoom.</li>
		* <li>To do CENTER_ONLY zoom, the application has below 2 options:<ol>
		* <li>Set {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} to 1.0; adjust zoom by {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}.</li>
		* <li>Adjust zoom by {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}; use {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to crop
		* the field of view vertically (letterboxing) or horizontally (pillarboxing), but not
		* windowboxing.</li>
		* </ol>
		* </li>
		* <li>Setting {@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio} to values different than 1.0 and
		* {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion} to be windowboxing at the same time is undefined behavior.</li>
		* </ul>
		* <p>LEGACY capability devices will only support CENTER_ONLY cropping.</p>
		* <p><b>Possible values:</b>
		* <ul>
		@@ -2675,6 +2769,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </ul></p>
		* <p>This key is available on all devices.</p>
		*
		* @see CaptureRequest#CONTROL_ZOOM_RATIO
		* @see CaptureRequest#SCALER_CROP_REGION
		* @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE
		* @see #SCALER_CROPPING_TYPE_CENTER_ONLY

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -764,6 +764,7 @@ public abstract class CameraMetadata<TKey> {
		* <li>{@link CaptureRequest#CONTROL_AWB_REGIONS android.control.awbRegions}</li>
		* <li>{@link CaptureRequest#CONTROL_AF_TRIGGER android.control.afTrigger}</li>
		* <li>{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger}</li>
		* <li>{@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}</li>
		* </ul>
		* <p>Outside of android.control.*, the following controls will work:</p>
		* <ul>
		@@ -812,6 +813,7 @@ public abstract class CameraMetadata<TKey> {
		* @see CaptureRequest#CONTROL_AWB_REGIONS
		* @see CaptureRequest#CONTROL_EFFECT_MODE
		* @see CaptureRequest#CONTROL_MODE
		* @see CaptureRequest#CONTROL_ZOOM_RATIO
		* @see CaptureRequest#FLASH_MODE
		* @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE
		* @see CaptureRequest#SCALER_CROP_REGION
		@@ -2316,6 +2318,7 @@ public abstract class CameraMetadata<TKey> {
		* <li>{@link CaptureRequest#CONTROL_AWB_REGIONS android.control.awbRegions}</li>
		* <li>{@link CaptureRequest#CONTROL_AF_TRIGGER android.control.afTrigger}</li>
		* <li>{@link CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER android.control.aePrecaptureTrigger}</li>
		* <li>{@link CaptureRequest#CONTROL_ZOOM_RATIO android.control.zoomRatio}</li>
		* </ul>
		* <p>Outside of android.control.*, the following controls will work:</p>
		* <ul>
		@@ -2362,6 +2365,7 @@ public abstract class CameraMetadata<TKey> {
		* @see CaptureRequest#CONTROL_AWB_REGIONS
		* @see CaptureRequest#CONTROL_EFFECT_MODE
		* @see CaptureRequest#CONTROL_MODE
		* @see CaptureRequest#CONTROL_ZOOM_RATIO
		* @see CaptureRequest#FLASH_MODE
		* @see CaptureRequest#LENS_OPTICAL_STABILIZATION_MODE
		* @see CaptureRequest#SCALER_CROP_REGION

core/java/android/hardware/camera2/CaptureRequest.java

+92 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/hardware/camera2/CaptureResult.java

+118 −4

File changed.

Preview size limit exceeded, changes collapsed.