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

Commit 7b4e8873 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge changes from topics 'add-depth-capability', 'add-highresolution-level' 

* changes:
  Camera2: Add DEPTH_OUTPUT capability and DEPTH_DEPTH_IS_EXCLUSIVE field.
  Camera: Add HIGH_RESOLUTION hardware level.
parents e354f5d5 0b7b03b3

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -13177,6 +13177,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AF;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AWB;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> DEPTH_DEPTH_IS_EXCLUSIVE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
@@ -13405,6 +13406,7 @@ package android.hardware.camera2 { 
    field public static final int HOT_PIXEL_MODE_HIGH_QUALITY = 2; // 0x2

    field public static final int HOT_PIXEL_MODE_OFF = 0; // 0x0

    field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1; // 0x1

    field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_HIGH_RESOLUTION = 3; // 0x3

    field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY = 2; // 0x2

    field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0

    field public static final int LENS_FACING_BACK = 1; // 0x1
@@ -13423,6 +13425,7 @@ package android.hardware.camera2 { 
    field public static final int NOISE_REDUCTION_MODE_OFF = 0; // 0x0

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE = 0; // 0x0

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE = 6; // 0x6

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8; // 0x8

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_OPAQUE_REPROCESSING = 4; // 0x4

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -13473,6 +13473,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AF;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> CONTROL_MAX_REGIONS_AWB;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> DEPTH_DEPTH_IS_EXCLUSIVE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
@@ -13701,6 +13702,7 @@ package android.hardware.camera2 { 
    field public static final int HOT_PIXEL_MODE_HIGH_QUALITY = 2; // 0x2

    field public static final int HOT_PIXEL_MODE_OFF = 0; // 0x0

    field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_FULL = 1; // 0x1

    field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_HIGH_RESOLUTION = 3; // 0x3

    field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY = 2; // 0x2

    field public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED = 0; // 0x0

    field public static final int LENS_FACING_BACK = 1; // 0x1
@@ -13719,6 +13721,7 @@ package android.hardware.camera2 { 
    field public static final int NOISE_REDUCTION_MODE_OFF = 0; // 0x0

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE = 0; // 0x0

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE = 6; // 0x6

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8; // 0x8

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1

    field public static final int REQUEST_AVAILABLE_CAPABILITIES_OPAQUE_REPROCESSING = 4; // 0x4

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

+40 −1
Original line number Diff line number Diff line
@@ -1030,12 +1030,13 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * point, <code>z_s = 1</code>, and <code>w_s</code> is a measurement of disparity

     * (depth) in pixel coordinates.</p>

     * <p><b>Units</b>:

     * Pixels in the android.sensor.activeArraySize coordinate

     * Pixels in the {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} coordinate

     * system.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_POSE_TRANSLATION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     */

    @PublicKey

    public static final Key<float[]> LENS_INTRINSIC_CALIBRATION =
@@ -1330,6 +1331,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS READ_SENSOR_SETTINGS}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE BURST_CAPTURE}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING YUV_REPROCESSING}</li>

     *   <li>{@link #REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT DEPTH_OUTPUT}</li>

     * </ul></p>

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

     *
@@ -1342,6 +1344,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS

     * @see #REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE

     * @see #REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING

     * @see #REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT

     */

    @PublicKey

    public static final Key<int[]> REQUEST_AVAILABLE_CAPABILITIES =
@@ -2542,11 +2545,23 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * post-processing, arbitrary cropping regions, and has relaxed performance constraints.</p>

     * <p>Each higher level supports everything the lower level supports

     * in this order: FULL <code>&gt;</code> LIMITED <code>&gt;</code> LEGACY.</p>

     * <p>A HIGH_RESOLUTION device is equivalent to a FULL device, except that:</p>

     * <ul>

     * <li>At least one output resolution of 8 megapixels or higher in uncompressed YUV is

     *   supported at <code>&gt;=</code> 20 fps.</li>

     * <li>Maximum-size (sensor resolution) uncompressed YUV is supported  at <code>&gt;=</code> 10

     *   fps.</li>

     * <li>For devices that list the RAW capability and support either RAW10 or RAW12 output,

     *   maximum-resolution RAW10 or RAW12 capture will operate at least at the rate of

     *   maximum-resolution YUV capture, and at least one supported output resolution of

     *   8 megapixels or higher in RAW10 or RAW12 is supported <code>&gt;=</code> 20 fps.</li>

     * </ul>

     * <p><b>Possible values:</b>

     * <ul>

     *   <li>{@link #INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED}</li>

     *   <li>{@link #INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL}</li>

     *   <li>{@link #INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY}</li>

     *   <li>{@link #INFO_SUPPORTED_HARDWARE_LEVEL_HIGH_RESOLUTION HIGH_RESOLUTION}</li>

     * </ul></p>

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

     *
@@ -2564,6 +2579,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED

     * @see #INFO_SUPPORTED_HARDWARE_LEVEL_FULL

     * @see #INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY

     * @see #INFO_SUPPORTED_HARDWARE_LEVEL_HIGH_RESOLUTION

     */

    @PublicKey

    public static final Key<Integer> INFO_SUPPORTED_HARDWARE_LEVEL =
@@ -2694,6 +2710,29 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<android.hardware.camera2.params.StreamConfigurationDuration[]> DEPTH_AVAILABLE_DEPTH_STALL_DURATIONS =

            new Key<android.hardware.camera2.params.StreamConfigurationDuration[]>("android.depth.availableDepthStallDurations", android.hardware.camera2.params.StreamConfigurationDuration[].class);



    /**

     * <p>Indicates whether a capture request may target both a

     * DEPTH16 / DEPTH_POINT_CLOUD output, and normal color outputs (such as

     * YUV_420_888, JPEG, or RAW) simultaneously.</p>

     * <p>If TRUE, including both depth and color outputs in a single

     * capture request is not supported. An application must interleave color

     * and depth requests.  If FALSE, a single request can target both types

     * of output.</p>

     * <p>Typically, this restriction exists on camera devices that

     * need to emit a specific pattern or wavelength of light to

     * measure depth values, which causes the color image to be

     * corrupted during depth measurement.</p>

     * <p><b>Optional</b> - This value 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

    public static final Key<Boolean> DEPTH_DEPTH_IS_EXCLUSIVE =

            new Key<Boolean>("android.depth.depthIsExclusive", boolean.class);



    /*~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~

     * End generated code

     *~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~@~O@*/

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

+52 −1
Original line number Diff line number Diff line
@@ -303,10 +303,13 @@ public abstract class CameraMetadata<TKey> { 
     * <p>The minimal set of capabilities that every camera

     * device (regardless of {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel})

     * supports.</p>

     * <p>This capability is listed by all devices, and

     * <p>This capability is listed by all normal devices, and

     * indicates that the camera device has a feature set

     * that's comparable to the baseline requirements for the

     * older android.hardware.Camera API.</p>

     * <p>Devices with the DEPTH_OUTPUT capability might not list this

     * capability, indicating that they support only depth measurement,

     * not standard color output.</p>

     *

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
@@ -545,6 +548,11 @@ public abstract class CameraMetadata<TKey> { 
     * {@link CameraCharacteristics#CONTROL_AWB_LOCK_AVAILABLE android.control.awbLockAvailable} are also guaranteed

     * to be <code>true</code> so burst capture with these two locks ON

     * yields consistent image output.</p>

     * <p>On a camera device that reports the HIGH_RESOLUTION hardware

     * level, meaning the device supports very large capture sizes,

     * BURST_CAPTURE means that at least 8-megapixel images can be

     * captured at <code>&gt;=</code> 20 fps, and maximum-resolution images can be

     * captured at <code>&gt;=</code> 10 fps.</p>

     *

     * @see CameraCharacteristics#CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES

     * @see CameraCharacteristics#CONTROL_AE_LOCK_AVAILABLE
@@ -596,6 +604,42 @@ public abstract class CameraMetadata<TKey> { 
     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7;



    /**

     * <p>The camera device can produce depth measurements from its field of view.</p>

     * <p>This capability requires the camera device to support the following:</p>

     * <ul>

     * <li>DEPTH16 is supported as an output format.</li>

     * <li>DEPTH_POINT_CLOUD is optionally supported as an output format.</li>

     * <li>This camera device, and all camera devices with the same android.lens.info.facing,

     *   will list the following calibration entries in both CameraCharacteristics and

     *   CaptureResults:<ul>

     * <li>{@link CameraCharacteristics#LENS_POSE_TRANSLATION android.lens.poseTranslation}</li>

     * <li>{@link CameraCharacteristics#LENS_POSE_ROTATION android.lens.poseRotation}</li>

     * <li>android.lens.intrinsicCalibration</li>

     * <li>android.lens.radialDistortion</li>

     * </ul>

     * </li>

     * <li>The {@link CameraCharacteristics#DEPTH_DEPTH_IS_EXCLUSIVE android.depth.depthIsExclusive} entry is listed by this device.</li>

     * <li>A LIMITED camera with only the DEPTH_OUTPUT capability does not have to support

     *   normal YUV_420_888, JPEG, and PRIV-format outputs. It only has to support the DEPTH16

     *   format.</li>

     * </ul>

     * <p>Generally, depth output operates at a slower frame rate than standard color capture,

     * so the DEPTH16 and DEPTH_POINT_CLOUD formats will commonly have a stall duration that

     * should be accounted for (see

     * android.hardware.camera2.StreamConfigurationMap#getOutputStallDuration).  On a device

     * that supports both depth and color-based output, to enable smooth preview, using a

     * repeating burst is recommended, where a depth-output target is only included once

     * every N frames, where N is the ratio between preview output rate and depth output

     * rate, including depth stall time.</p>

     *

     * @see CameraCharacteristics#DEPTH_DEPTH_IS_EXCLUSIVE

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_POSE_TRANSLATION

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8;



    //

    // Enumeration values for CameraCharacteristics#SCALER_CROPPING_TYPE

    //
@@ -808,6 +852,13 @@ public abstract class CameraMetadata<TKey> { 
     */

    public static final int INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY = 2;



    /**

     * <p>This camera device is capable of supporting advanced imaging applications at full rate,

     * and additional high-resolution outputs at lower rates.</p>

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     */

    public static final int INFO_SUPPORTED_HARDWARE_LEVEL_HIGH_RESOLUTION = 3;



    //

    // Enumeration values for CameraCharacteristics#SYNC_MAX_LATENCY

    //

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

+2 −1
Original line number Diff line number Diff line
@@ -2628,12 +2628,13 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * point, <code>z_s = 1</code>, and <code>w_s</code> is a measurement of disparity

     * (depth) in pixel coordinates.</p>

     * <p><b>Units</b>:

     * Pixels in the android.sensor.activeArraySize coordinate

     * Pixels in the {@link CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE android.sensor.info.activeArraySize} coordinate

     * system.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CameraCharacteristics#LENS_POSE_ROTATION

     * @see CameraCharacteristics#LENS_POSE_TRANSLATION

     * @see CameraCharacteristics#SENSOR_INFO_ACTIVE_ARRAY_SIZE

     */

    @PublicKey

    public static final Key<float[]> LENS_INTRINSIC_CALIBRATION =