diff options
| author | 2024-11-12 01:29:13 +0000 | |
|---|---|---|
| committer | 2024-11-12 01:29:13 +0000 | |
| commit | b0fafd77dc27e26cbf5c9af73f8225a5cb542024 (patch) | |
| tree | 9a239528153d58d5cfbf5936be65c9975b894646 | |
| parent | 611c9fbf6939376501c07e113ac78a43ff5009c4 (diff) | |
| parent | 2bedb57ec8cc9467c283adc2c648fce8f9527396 (diff) | |
Merge "Camera: Add feature combination query version for Baklava" into main
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 4ca20059f4eb..58e524e741b3 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -560,7 +560,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * on a particular SessionConfiguration.</p> * * @return List of CameraCharacteristic keys containing characterisitics specific to a session - * configuration. If {@link #INFO_SESSION_CONFIGURATION_QUERY_VERSION} is + * configuration. If {@link #INFO_SESSION_CONFIGURATION_QUERY_VERSION} is at least * {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}, then this list will only contain * CONTROL_ZOOM_RATIO_RANGE and SCALER_AVAILABLE_MAX_DIGITAL_ZOOM * @@ -5259,6 +5259,32 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <p>All of the above configurations can be set up with a SessionConfiguration. The list of * OutputConfiguration contains the stream configurations and DYNAMIC_RANGE_PROFILE, and * the AE_TARGET_FPS_RANGE and VIDEO_STABILIZATION_MODE are set as session parameters.</p> + * <p>When set to BAKLAVA, the additional stream combinations below are verified + * by the compliance tests:</p> + * <table> + * <thead> + * <tr> + * <th style="text-align: center;">Target 1</th> + * <th style="text-align: center;">Size</th> + * <th style="text-align: center;">Target 2</th> + * <th style="text-align: center;">Size</th> + * </tr> + * </thead> + * <tbody> + * <tr> + * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">S1080P</td> + * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">S1080P</td> + * </tr> + * <tr> + * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">S1080P</td> + * <td style="text-align: center;">PRIV</td> + * <td style="text-align: center;">S1440P</td> + * </tr> + * </tbody> + * </table> * <p>This key is available on all devices.</p> */ @PublicKey |