Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cd4b66c authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge changes from topic "b113052379-cp-from-pi-dev-p1" 

* changes:
  Camera: hardware level related doc update
  Camera: codegen doc update
parents 680f6e80 a8cfb0ae

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

+37 −9
Original line number Diff line number Diff line
@@ -2371,13 +2371,25 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * {@link CaptureRequest#SCALER_CROP_REGION android.scaler.cropRegion}, is defined relative to the active array rectangle given in

     * this field, with <code>(0, 0)</code> being the top-left of this rectangle.</p>

     * <p>The active array may be smaller than the full pixel array, since the full array may

     * include black calibration pixels or other inactive regions, and geometric correction

     * resulting in scaling or cropping may have been applied.</p>

     * include black calibration pixels or other inactive regions.</p>

     * <p>For devices that do not support {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the active

     * array must be the same as {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.</p>

     * <p>For devices that support {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} control, the active array must

     * be enclosed by {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}. The difference between

     * pre-correction active array and active array accounts for scaling or cropping caused

     * by lens geometric distortion correction.</p>

     * <p>In general, application should always refer to active array size for controls like

     * metering regions or crop region. Two exceptions are when the application is dealing with

     * RAW image buffers (RAW_SENSOR, RAW10, RAW12 etc), or when application explicitly set

     * {@link CaptureRequest#DISTORTION_CORRECTION_MODE android.distortionCorrection.mode} to OFF. In these cases, application should refer

     * to {@link CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE android.sensor.info.preCorrectionActiveArraySize}.</p>

     * <p><b>Units</b>: Pixel coordinates on the image sensor</p>

     * <p>This key is available on all devices.</p>

     *

     * @see CaptureRequest#DISTORTION_CORRECTION_MODE

     * @see CaptureRequest#SCALER_CROP_REGION

     * @see CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE

     * @see CameraCharacteristics#SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE

     */

    @PublicKey

    public static final Key<android.graphics.Rect> SENSOR_INFO_ACTIVE_ARRAY_SIZE =
@@ -2622,9 +2634,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <ol>

     * <li>{@link CameraCharacteristics#LENS_DISTORTION android.lens.distortion}.</li>

     * </ol>

     * <p>If all of the geometric distortion fields are no-ops, this rectangle will be the same

     * as the post-distortion-corrected rectangle given in

     * {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p>

     * <p>If the camera device doesn't support geometric distortion correction, or all of the

     * geometric distortion fields are no-ops, this rectangle will be the same as the

     * post-distortion-corrected rectangle given in {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize}.</p>

     * <p>This rectangle is defined relative to the full pixel array; (0,0) is the top-left of

     * the full pixel array, and the size of the full pixel array is given by

     * {@link CameraCharacteristics#SENSOR_INFO_PIXEL_ARRAY_SIZE android.sensor.info.pixelArraySize}.</p>
@@ -3130,12 +3142,26 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * the following code snippet can be used:</p>

     * <pre><code>// Returns true if the device supports the required hardware level, or better.

     * boolean isHardwareLevelSupported(CameraCharacteristics c, int requiredLevel) {

     *     final int[] sortedHwLevels = {

     *         CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY,

     *         CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL,

     *         CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED,

     *         CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL,

     *         CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_3

     *     };

     *     int deviceLevel = c.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);

     *     if (deviceLevel == CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) {

     *         return requiredLevel == deviceLevel;

     *     if (requiredLevel == deviceLevel) {

     *         return true;

     *     }

     *

     *     for (int sortedlevel : sortedHwLevels) {

     *         if (sortedlevel == requiredLevel) {

     *             return true;

     *         } else if (sortedlevel == deviceLevel) {

     *             return false;

     *         }

     *     }

     *     // deviceLevel is not LEGACY, can use numerical sort

     *     return requiredLevel &lt;= deviceLevel;

     *     return false; // Should never reach here

     * }

     * </code></pre>

     * <p>At a high level, the levels are:</p>
@@ -3149,6 +3175,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     *   post-processing settings, and image capture at a high rate.</li>

     * <li><code>LEVEL_3</code> devices additionally support YUV reprocessing and RAW image capture, along

     *   with additional output stream configurations.</li>

     * <li><code>EXTERNAL</code> devices are similar to <code>LIMITED</code> devices with exceptions like some sensor or

     *   lens information not reorted or less stable framerates.</li>

     * </ul>

     * <p>See the individual level enums for full descriptions of the supported capabilities.  The

     * {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} entry describes the device's capabilities at a

core/java/android/hardware/camera2/CameraDevice.java

+14 −6
Original line number Diff line number Diff line
@@ -44,19 +44,27 @@ import java.lang.annotation.RetentionPolicy; 
 * {@link android.Manifest.permission#CAMERA Camera} permission in its manifest

 * in order to access camera devices.</p>

 *

 * <p>A given camera device may provide support at one of two levels: limited or

 * full. If a device only supports the limited level, then Camera2 exposes a

 * feature set that is roughly equivalent to the older

 * <p>A given camera device may provide support at one of several levels defined

 * in {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}.

 * If a device supports {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY} level,

 * the camera device is running in backward compatibility mode and has minimum camera2 API support.

 * If a device supports the {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED}

 * level, then Camera2 exposes a feature set that is roughly equivalent to the older

 * {@link android.hardware.Camera Camera} API, although with a cleaner and more

 * efficient interface.  Devices that implement the full level of support

 * efficient interface.

 * If a device supports the {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_EXTERNAL EXTERNAL}

 * level, then the device is a removable camera that provides similar but slightly less features

 * as the {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED} level.

 * Devices that implement the {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL} or

 * {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_3 LEVEL3} level of support

 * provide substantially improved capabilities over the older camera

 * API. Applications that target the limited level devices will run unchanged on

 * the full-level devices; if your application requires a full-level device for

 * API. If your application requires a full-level device for

 * proper operation, declare the "android.hardware.camera.level.full" feature in your

 * manifest.</p>

 *

 * @see CameraManager#openCamera

 * @see android.Manifest.permission#CAMERA

 * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

 */

public abstract class CameraDevice implements AutoCloseable {

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

+111 −33

File changed.

Preview size limit exceeded, changes collapsed.

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

+135 −35

File changed.

Preview size limit exceeded, changes collapsed.