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

Commit bcff29e9 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 3f78e374 am: 32e00d40 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25549279



Change-Id: I8d649548065a1cdc9e5be2d26000c1585d3529df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1795a29e 32e00d40

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

+24 −17
Original line number Diff line number Diff line
@@ -3203,7 +3203,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * stream configurations are the same as for applications targeting SDK version older than

     * 31.</p>

     * <p>Refer to {@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} and

     * {@link android.hardware.camera2.CameraDevice#legacy-level-guaranteed-configurations }

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#legacy-level-guaranteed-configurations">the table</a>

     * for additional mandatory stream configurations on a per-capability basis.</p>

     * <p>*1: For JPEG format, the sizes may be restricted by below conditions:</p>

     * <ul>
@@ -3322,11 +3322,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * {@link android.hardware.camera2.CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL }

     * and {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES }.

     * This is an app-readable conversion of the mandatory stream combination

     * {@link android.hardware.camera2.CameraDevice#legacy-level-guaranteed-configurations tables}.</p>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#legacy-level-guaranteed-configurations">tables</a>.</p>

     * <p>The array of

     * {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is

     * generated according to the documented

     * {@link android.hardware.camera2.CameraDevice#legacy-level-guaranteed-configurations guideline} based on specific device level and capabilities.

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#legacy-level-guaranteed-configurations">guideline</a>.

     * based on specific device level and capabilities.

     * Clients can use the array as a quick reference to find an appropriate camera stream

     * combination.

     * As per documentation, the stream combinations with given PREVIEW, RECORD and
@@ -3355,11 +3356,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    /**

     * <p>An array of mandatory concurrent stream combinations.

     * This is an app-readable conversion of the concurrent mandatory stream combination

     * {@link android.hardware.camera2.CameraDevice#concurrent-stream-guaranteed-configurations tables}.</p>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#concurrent-stream-guaranteed-configurations">tables</a>.</p>

     * <p>The array of

     * {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is

     * generated according to the documented

     * {@link android.hardware.camera2.CameraDevice#concurrent-stream-guaranteed-configurations guideline} for each device which has its Id present in the set returned by

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#concurrent-stream-guaranteed-configurations">guideline</a>

     * for each device which has its Id present in the set returned by

     * {@link android.hardware.camera2.CameraManager#getConcurrentCameraIds }.

     * Clients can use the array as a quick reference to find an appropriate camera stream

     * combination.
@@ -3464,7 +3466,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>If a camera device supports multi-resolution output streams for a particular format, for

     * each of its mandatory stream combinations, the camera device will support using a

     * MultiResolutionImageReader for the MAXIMUM stream of supported formats. Refer to

     * {@link android.hardware.camera2.CameraDevice#legacy-level-additional-guaranteed-combinations-with-multiresolutionoutputs }

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#legacy-level-additional-guaranteed-combinations-with-multiresolutionoutputs">the table</a>

     * for additional details.</p>

     * <p>To use multi-resolution input streams, the supported formats can be queried by {@link android.hardware.camera2.params.MultiResolutionStreamConfigurationMap#getInputFormats }.

     * A reprocessable CameraCaptureSession can then be created using an {@link android.hardware.camera2.params.InputConfiguration InputConfiguration} constructed with
@@ -3473,7 +3475,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * {@code YUV} output, or multi-resolution {@code PRIVATE} input and multi-resolution

     * {@code PRIVATE} output, {@code JPEG} and {@code YUV} are guaranteed to be supported

     * multi-resolution output stream formats. Refer to

     * {@link android.hardware.camera2.CameraDevice#legacy-level-additional-guaranteed-combinations-with-multiresolutionoutputs }}

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#legacy-level-additional-guaranteed-combinations-with-multiresolutionoutputs">the table</a>

     * for details about the additional mandatory stream combinations in this case.</p>

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

     */
@@ -3586,11 +3588,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * {@link android.hardware.camera2.CaptureRequest } has {@link CaptureRequest#SENSOR_PIXEL_MODE android.sensor.pixelMode} set

     * to {@link android.hardware.camera2.CameraMetadata#SENSOR_PIXEL_MODE_MAXIMUM_RESOLUTION }.

     * This is an app-readable conversion of the maximum resolution mandatory stream combination

     * {@link android.hardware.camera2.CameraDevice#additional-guaranteed-combinations-for-ultra-high-resolution-sensors tables}.</p>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#additional-guaranteed-combinations-for-ultra-high-resolution-sensors">tables</a>.</p>

     * <p>The array of

     * {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is

     * generated according to the documented

     * {@link android.hardware.camera2.CameraDevice#additional-guaranteed-combinations-for-ultra-high-resolution-sensors guideline} for each device which has the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#additional-guaranteed-combinations-for-ultra-high-resolution-sensors">guideline</a>

     * for each device which has the

     * {@link android.hardware.camera2.CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR }

     * capability.

     * Clients can use the array as a quick reference to find an appropriate camera stream
@@ -3613,11 +3616,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * 10-bit output capability

     * {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT }

     * This is an app-readable conversion of the 10 bit output mandatory stream combination

     * {@link android.hardware.camera2.CameraDevice#10-bit-output-additional-guaranteed-configurations tables}.</p>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#10-bit-output-additional-guaranteed-configurations">tables</a>.</p>

     * <p>The array of

     * {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is

     * generated according to the documented

     * {@link android.hardware.camera2.CameraDevice#10-bit-output-additional-guaranteed-configurations guideline} for each device which has the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#10-bit-output-additional-guaranteed-configurations">guideline</a>

     * for each device which has the

     * {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT }

     * capability.

     * Clients can use the array as a quick reference to find an appropriate camera stream
@@ -3638,11 +3642,12 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * {@code PREVIEW_STABILIZATION} in {@link CameraCharacteristics#CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES android.control.availableVideoStabilizationModes}.

     * This is an app-readable conversion of the preview stabilization mandatory stream

     * combination

     * {@link android.hardware.camera2.CameraDevice#preview-stabilization-guaranteed-stream-configurations tables}.</p>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#preview-stabilization-guaranteed-stream-configurations">tables</a>.</p>

     * <p>The array of

     * {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is

     * generated according to the documented

     * {@link android.hardware.camera2.CameraDevice#preview-stabilization-guaranteed-stream-configurations guideline} for each device which supports {@code PREVIEW_STABILIZATION}

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#preview-stabilization-guaranteed-stream-configurations">guideline</a>

     * for each device which supports {@code PREVIEW_STABILIZATION}

     * Clients can use the array as a quick reference to find an appropriate camera stream

     * combination.

     * The mandatory stream combination array will be {@code null} in case the device does not
@@ -3715,8 +3720,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>The guaranteed stream combinations related to stream use case for a camera device with

     * {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE }

     * capability is documented in the camera device

     * {@link android.hardware.camera2.CameraDevice#stream-use-case-capability-additional-guaranteed-configurations guideline}. The application is strongly recommended to use one of the guaranteed stream

     * combinations.

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#stream-use-case-capability-additional-guaranteed-configurations">guideline</a>.

     * The application is strongly recommended to use one of the guaranteed stream combinations.

     * If the application creates a session with a stream combination not in the guaranteed

     * list, or with mixed DEFAULT and non-DEFAULT use cases within the same session,

     * the camera device may ignore some stream use cases due to hardware constraints
@@ -3752,11 +3757,13 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    /**

     * <p>An array of mandatory stream combinations with stream use cases.

     * This is an app-readable conversion of the mandatory stream combination

     * {@link android.hardware.camera2.CameraDevice#stream-use-case-capability-additional-guaranteed-configurations tables} with each stream's use case being set.</p>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#stream-use-case-capability-additional-guaranteed-configurations">tables</a>

     * with each stream's use case being set.</p>

     * <p>The array of

     * {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is

     * generated according to the documented

     * {@link android.hardware.camera2.CameraDevice#stream-use-case-capability-additional-guaranteed-configurations guideline} for a camera device with

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#stream-use-case-capability-additional-guaranteed-configurations">guildeline</a>

     * for a camera device with

     * {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE }

     * capability.

     * The mandatory stream combination array will be {@code null} in case the device doesn't

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

+15 −16
Original line number Diff line number Diff line
@@ -1213,8 +1213,7 @@ public abstract class CameraMetadata<TKey> { 
     * <ul>

     * <li>Profile {@link android.hardware.camera2.params.DynamicRangeProfiles#HLG10 }</li>

     * <li>All mandatory stream combinations for this specific capability as per

     *   documentation

     *   {@link android.hardware.camera2.CameraDevice#10-bit-output-additional-guaranteed-configurations }</li>

     *   <a href="CameraDevice#10-bit-output-additional-guaranteed-configurations">documentation</a></li>

     * <li>In case the device is not able to capture some combination of supported

     *   standard 8-bit and/or 10-bit dynamic range profiles within the same capture request,

     *   then those constraints must be listed in
@@ -1253,8 +1252,8 @@ public abstract class CameraMetadata<TKey> { 
     * </ul>

     * <p>{@link android.hardware.camera2.CameraCharacteristics#SCALER_AVAILABLE_STREAM_USE_CASES }

     * lists all of the supported stream use cases.</p>

     * <p>Refer to

     * {@link android.hardware.camera2.CameraDevice#stream-use-case-capability-additional-guaranteed-configurations }

     * <p>Refer to the

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#stream-use-case-capability-additional-guaranteed-configurations">guideline</a>

     * for the mandatory stream combinations involving stream use cases, which can also be

     * queried via {@link android.hardware.camera2.params.MandatoryStreamCombination }.</p>

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
@@ -1753,9 +1752,9 @@ public abstract class CameraMetadata<TKey> { 
    /**

     * <p>This camera device does not have enough capabilities to qualify as a <code>FULL</code> device or

     * better.</p>

     * <p>Only the stream configurations listed in the <code>LEGACY</code> and <code>LIMITED</code> tables in the

     * {@link android.hardware.camera2.CameraDevice#limited-level-additional-guaranteed-configurations }

     * documentation are guaranteed to be supported.</p>

     * <p>Only the stream configurations listed in the <code>LEGACY</code> and <code>LIMITED</code>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#limited-level-additional-guaranteed-configurations">tables</a>

     * in the documentation are guaranteed to be supported.</p>

     * <p>All <code>LIMITED</code> devices support the <code>BACKWARDS_COMPATIBLE</code> capability, indicating basic

     * support for color image capture. The only exception is that the device may

     * alternatively support only the <code>DEPTH_OUTPUT</code> capability, if it can only output depth
@@ -1781,9 +1780,9 @@ public abstract class CameraMetadata<TKey> { 


    /**

     * <p>This camera device is capable of supporting advanced imaging applications.</p>

     * <p>The stream configurations listed in the <code>FULL</code>, <code>LEGACY</code> and <code>LIMITED</code> tables in the

     * {@link android.hardware.camera2.CameraDevice#full-level-additional-guaranteed-configurations }

     * documentation are guaranteed to be supported.</p>

     * <p>The stream configurations listed in the <code>FULL</code>, <code>LEGACY</code> and <code>LIMITED</code>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#full-level-additional-guaranteed-configurations">tables</a>

     * in the documentation are guaranteed to be supported.</p>

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

     * <ul>

     * <li><code>BURST_CAPTURE</code> capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES android.request.availableCapabilities} contains
@@ -1811,9 +1810,9 @@ public abstract class CameraMetadata<TKey> { 


    /**

     * <p>This camera device is running in backward compatibility mode.</p>

     * <p>Only the stream configurations listed in the <code>LEGACY</code> table in the

     * {@link android.hardware.camera2.CameraDevice#legacy-level-guaranteed-configurations }

     * documentation are supported.</p>

     * <p>Only the stream configurations listed in the <code>LEGACY</code>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#legacy-level-guaranteed-configurations">table</a>

     * in the documentation are supported.</p>

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

     * post-processing, arbitrary cropping regions, and has relaxed performance constraints.

     * No additional capabilities beyond <code>BACKWARD_COMPATIBLE</code> will ever be listed by a
@@ -1836,9 +1835,9 @@ public abstract class CameraMetadata<TKey> { 
     * <p>This camera device is capable of YUV reprocessing and RAW data capture, in addition to

     * FULL-level capabilities.</p>

     * <p>The stream configurations listed in the <code>LEVEL_3</code>, <code>RAW</code>, <code>FULL</code>, <code>LEGACY</code> and

     * <code>LIMITED</code> tables in the

     * {@link android.hardware.camera2.CameraDevice#level-3-additional-guaranteed-configurations }

     * documentation are guaranteed to be supported.</p>

     * <code>LIMITED</code>

     * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#level-3-additional-guaranteed-configurations">tables</a>

     * in the documentation are guaranteed to be supported.</p>

     * <p>The following additional capabilities are guaranteed to be supported:</p>

     * <ul>

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