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

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

Merge "Camera2: Add LEVEL_3 to android.info.supportedHardwareLevel"

parents e33b9541 7c6d73f4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13841,6 +13841,7 @@ package android.hardware.camera2 { 
    field public static final int HOT_PIXEL_MODE_FAST = 1; // 0x1

    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_3 = 3; // 0x3

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

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

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14242,6 +14242,7 @@ package android.hardware.camera2 { 
    field public static final int HOT_PIXEL_MODE_FAST = 1; // 0x1

    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_3 = 3; // 0x3

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

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

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13849,6 +13849,7 @@ package android.hardware.camera2 { 
    field public static final int HOT_PIXEL_MODE_FAST = 1; // 0x1

    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_3 = 3; // 0x3

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

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

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

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

+33 −27
Original line number Diff line number Diff line
@@ -2787,22 +2787,39 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 


    /**

     * <p>Generally classifies the overall set of the camera device functionality.</p>

     * <p>Camera devices will come in three flavors: LEGACY, LIMITED and FULL.</p>

     * <p>A FULL device will support below capabilities:</p>

     * <p>The supported hardware level is a high-level description of the camera device's

     * capabilities, summarizing several capabilities into one field.  Each level adds additional

     * features to the previous one, and is always a strict superset of the previous level.

     * The ordering is <code>LEGACY &lt; LIMITED &lt; FULL &lt; LEVEL_3</code>.</p>

     * <p>Starting from <code>LEVEL_3</code>, the level enumerations are guaranteed to be in increasing

     * numerical value as well. To check if a given device is at least at a given hardware level,

     * 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) {

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

     *     if (deviceLevel == CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) {

     *         return requiredLevel == deviceLevel;

     *     }

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

     *     return requiredLevel &lt;= deviceLevel;

     * }

     * </code></pre>

     * <p>At a high level, the levels are:</p>

     * <ul>

     * <li>BURST_CAPTURE capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains BURST_CAPTURE)</li>

     * <li>Per frame control ({@link CameraCharacteristics#SYNC_MAX_LATENCY android.sync.maxLatency} <code>==</code> PER_FRAME_CONTROL)</li>

     * <li>Manual sensor control ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains MANUAL_SENSOR)</li>

     * <li>Manual post-processing control ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains

     *   MANUAL_POST_PROCESSING)</li>

     * <li>At least 3 processed (but not stalling) format output streams

     *   ({@link CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_PROC android.request.maxNumOutputProc} <code>&gt;=</code> 3)</li>

     * <li>The required stream configurations defined in android.scaler.availableStreamConfigurations</li>

     * <li>The required exposure time range defined in {@link CameraCharacteristics#SENSOR_INFO_EXPOSURE_TIME_RANGE android.sensor.info.exposureTimeRange}</li>

     * <li>The required maxFrameDuration defined in {@link CameraCharacteristics#SENSOR_INFO_MAX_FRAME_DURATION android.sensor.info.maxFrameDuration}</li>

     * <li><code>LEGACY</code> devices operate in a backwards-compatibility mode for older

     *   Android devices, and have very limited capabilities.</li>

     * <li><code>LIMITED</code> devices represent the

     *   baseline feature set, and may also include additional capabilities that are

     *   subsets of <code>FULL</code>.</li>

     * <li><code>FULL</code> devices additionally support per-frame manual control of sensor, flash, lens and

     *   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>

     * </ul>

     * <p>A LIMITED device may have some or none of the above characteristics.

     * To find out more refer to {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities}.</p>

     * <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

     * finer-grain level, if needed. In addition, many controls have their available settings or

     * ranges defined in individual {@link android.hardware.camera2.CameraCharacteristics } entries.</p>

     * <p>Some features are not part of any particular hardware level or capability and must be

     * queried separately. These include:</p>

     * <ul>
@@ -2813,19 +2830,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     *   ({@link CameraCharacteristics#LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION android.lens.info.availableOpticalStabilization},

     *    {@link CameraCharacteristics#CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES android.control.availableVideoStabilizationModes})</li>

     * </ul>

     * <p>A LEGACY device does not support per-frame control, manual sensor control, manual

     * 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>Note:

     * Pre-API level 23, FULL devices also supported arbitrary cropping region

     * ({@link CameraCharacteristics#SCALER_CROPPING_TYPE android.scaler.croppingType} <code>==</code> FREEFORM); this requirement was relaxed in API level 23,

     * and FULL devices may only support CENTERED cropping.</p>

     * <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_3 3}</li>

     * </ul></p>

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

     *
@@ -2833,16 +2843,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see CameraCharacteristics#LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION

     * @see CameraCharacteristics#LENS_INFO_FOCUS_DISTANCE_CALIBRATION

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     * @see CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_PROC

     * @see CameraCharacteristics#SCALER_CROPPING_TYPE

     * @see CameraCharacteristics#SENSOR_INFO_EXPOSURE_TIME_RANGE

     * @see CameraCharacteristics#SENSOR_INFO_MAX_FRAME_DURATION

     * @see CameraCharacteristics#SENSOR_INFO_TIMESTAMP_SOURCE

     * @see CameraCharacteristics#STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES

     * @see CameraCharacteristics#SYNC_MAX_LATENCY

     * @see #INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED

     * @see #INFO_SUPPORTED_HARDWARE_LEVEL_FULL

     * @see #INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY

     * @see #INFO_SUPPORTED_HARDWARE_LEVEL_3

     */

    @PublicKey

    public static final Key<Integer> INFO_SUPPORTED_HARDWARE_LEVEL =

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

+38 −6
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * </table><br>

     * </p>

     *

     * <p>Limited-capability ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * <p>Limited-level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED}) devices

     * support at least the following stream combinations in addition to those for

     * {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY} devices:
@@ -332,13 +332,13 @@ public abstract class CameraDevice implements AutoCloseable { 
     * </table><br>

     * </p>

     *

     * <p>FULL-capability ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * <p>FULL-level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL}) devices

     * support at least the following stream combinations in addition to those for

     * {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED} devices:

     *

     * <table>

     * <tr><th colspan="7">FULL-capability additional guaranteed configurations</th></tr>

     * <tr><th colspan="7">FULL-level additional guaranteed configurations</th></tr>

     * <tr><th colspan="2" id="rb">Target 1</th><th colspan="2" id="rb">Target 2</th><th colspan="2" id="rb">Target 3</th> <th rowspan="2">Sample use case(s)</th> </tr>

     * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th> </tr>

     * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code MAXIMUM}</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution GPU processing with preview.</td> </tr>
@@ -389,6 +389,22 @@ public abstract class CameraDevice implements AutoCloseable { 
     * </table><br>

     * </p>

     *

     * <p>LEVEL-3 ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_3 LEVEL_3})

     * support at least the following stream combinations in addition to the combinations for

     * {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL} and for

     * RAW capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES} includes

     * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_RAW RAW}):

     *

     * <table>

     * <tr><th colspan="11">LEVEL-3 additional guaranteed configurations</th></tr>

     * <tr><th colspan="2" id="rb">Target 1</th><th colspan="2" id="rb">Target 2</th><th colspan="2" id="rb">Target 3</th><th colspan="2" id="rb">Target 4</th><th rowspan="2">Sample use case(s)</th> </tr>

     * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th> </tr>

     * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code 640x480}</td> <td>{@code YUV}</td><td id="rb">{@code MAXIMUM}</td> <td>{@code RAW}</td><td id="rb">{@code MAXIMUM}</td> <td>In-app viewfinder analysis with dynamic selection of output format.</td> </tr>

     * <tr> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code 640x480}</td> <td>{@code JPEG}</td><td id="rb">{@code MAXIMUM}</td> <td>{@code RAW}</td><td id="rb">{@code MAXIMUM}</td> <td>In-app viewfinder analysis with dynamic selection of output format.</td> </tr>

     * </table><br>

     * </p>

     *

     * <p>Since the capabilities of camera devices vary greatly, a given camera device may support

     * target combinations with sizes outside of these guarantees, but this can only be tested for

     * by attempting to create a session with such targets.</p>
@@ -501,7 +517,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     *  #rb { border-right-width: thick; }

     * </style>

     *

     * <p>Limited-capability ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * <p>LIMITED-level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED}) devices

     * support at least the following stream combinations for creating a reprocessable capture

     * session in addition to those listed in {@link #createCaptureSession createCaptureSession} for
@@ -518,14 +534,14 @@ public abstract class CameraDevice implements AutoCloseable { 
     * </table><br>

     * </p>

     *

     * <p>FULL-capability ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * <p>FULL-level ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL}) devices

     * support at least the following stream combinations for creating a reprocessable capture

     * session in addition to those for

     * {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED LIMITED} devices:

     *

     * <table>

     * <tr><th colspan="11">FULL-capability additional guaranteed configurations for creating a reprocessable capture session<br>({@code PRIV} input is guaranteed only if PRIVATE reprocessing is supported. {@code YUV} input is guaranteed only if YUV reprocessing is supported)</th></tr>

     * <tr><th colspan="11">FULL-level additional guaranteed configurations for creating a reprocessable capture session<br>({@code PRIV} input is guaranteed only if PRIVATE reprocessing is supported. {@code YUV} input is guaranteed only if YUV reprocessing is supported)</th></tr>

     * <tr><th colspan="2" id="rb">Input</th><th colspan="2" id="rb">Target 1</th><th colspan="2" id="rb">Target 2</th><th colspan="2" id="rb">Target 3</th><th colspan="2" id="rb">Target 4</th><th rowspan="2">Sample use case(s)</th> </tr>

     * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th></tr>

     * <tr> <td>{@code YUV}</td><td id="rb">{@code MAXIMUM}</td> <td>{@code YUV}</td><td id="rb">{@code MAXIMUM}</td> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td></td><td id="rb"></td> <td></td><td id="rb"></td> <td>Maximum-resolution multi-frame image fusion in-app processing with regular preview.</td> </tr>
@@ -555,6 +571,22 @@ public abstract class CameraDevice implements AutoCloseable { 
     * </table><br>

     * </p>

     *

     * <p>LEVEL-3 ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_3 LEVEL_3}) devices

     * support at least the following stream combinations for creating a reprocessable capture

     * session in addition to those for

     * {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL FULL} devices. Note that targets in the "Reprocess-only target" column may only be

     * used as an output target for a reprocess capture request, not as an output to a regular capture request.

     *

     * <table>

     * <tr><th colspan="13">LEVEL-3 additional guaranteed configurations for creating a reprocessable capture session<br>({@code PRIV} input is guaranteed only if PRIVATE reprocessing is supported. {@code YUV} input is always guaranteed.</th></tr>

     * <tr><th colspan="2" id="rb">Input</th><th colspan="2" id="rb">Target 1</th><th colspan="2" id="rb">Target 2</th><th colspan="2" id="rb">Target 3</th><th colspan="2" id="rb">Target 4</th><th colspan="2" id="rb">Reprocess-only target</th><th rowspan="2">Sample use case(s)</th> </tr>

     * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th></tr>

     * <tr> <td>{@code PRIV}/{@code YUV}</td><td id="rb">{@code MAXIMUM}</td> <td>Same as input</td><td id="rb">{@code MAXIMUM}</td> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code 640x480}</td> <td>{@code RAW}</td><td id="rb">{@code MAXIMUM}</td> <td></td><td id="rb"></td> <td>In-app viewfinder analysis with ZSL and RAW.</td> </tr>

     * <tr> <td>{@code PRIV}/{@code YUV}</td><td id="rb">{@code MAXIMUM}</td> <td>Same as input</td><td id="rb">{@code MAXIMUM}</td> <td>{@code PRIV}</td><td id="rb">{@code PREVIEW}</td> <td>{@code PRIV}</td><td id="rb">{@code 640x480}</td> <td>{@code RAW}</td><td id="rb">{@code MAXIMUM}</td> <td>{@code JPEG}</td><td id="rb">{@code MAXIMUM}</td><td>In-app viewfinder analysis with ZSL, RAW, and JPEG reprocessing output.</td> </tr>

     * </table><br>

     * </p>

     *

     * @param inputConfig The configuration for the input {@link Surface}

     * @param outputs The new set of Surfaces that should be made available as

     *                targets for captured image data.