diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 56 |
2 files changed, 56 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index f8aa89b..c360805 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11281,6 +11281,7 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CameraMetadata.Key REQUEST_PARTIAL_RESULT_COUNT; field public static final android.hardware.camera2.CameraMetadata.Key REQUEST_PIPELINE_MAX_DEPTH; field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_FORMATS; + field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP; field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_JPEG_MIN_DURATIONS; field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_JPEG_SIZES; field public static final android.hardware.camera2.CameraMetadata.Key SCALER_AVAILABLE_MAX_DIGITAL_ZOOM; diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index fb098b0..a8f7e35 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -495,7 +495,7 @@ public final class CameraCharacteristics extends CameraMetadata { /** * <p>The list of image formats that are supported by this - * camera device.</p> + * camera device for output streams.</p> * <p>All camera devices will support JPEG and YUV_420_888 formats.</p> * <p>When set to YUV_420_888, application can access the YUV420 data directly.</p> */ @@ -570,6 +570,60 @@ public final class CameraCharacteristics extends CameraMetadata { new Key<android.hardware.camera2.Size[]>("android.scaler.availableProcessedSizes", android.hardware.camera2.Size[].class); /** + * <p>The mapping of image formats that are supported by this + * camera device for input streams, to their corresponding output formats.</p> + * <p>All camera devices with at least 1 + * android.request.request.maxNumInputStreams will have at least one + * available input format.</p> + * <p>The camera device will support the following map of formats, + * if its dependent capability is supported:</p> + * <table> + * <thead> + * <tr> + * <th align="left">Input Format</th> + * <th align="left">Output Format</th> + * <th align="left">Capability</th> + * </tr> + * </thead> + * <tbody> + * <tr> + * <td align="left">RAW_OPAQUE</td> + * <td align="left">JPEG</td> + * <td align="left">ZSL</td> + * </tr> + * <tr> + * <td align="left">RAW_OPAQUE</td> + * <td align="left">YUV_420_888</td> + * <td align="left">ZSL</td> + * </tr> + * <tr> + * <td align="left">RAW_OPAQUE</td> + * <td align="left">RAW16</td> + * <td align="left">DNG</td> + * </tr> + * <tr> + * <td align="left">RAW16</td> + * <td align="left">YUV_420_888</td> + * <td align="left">DNG</td> + * </tr> + * <tr> + * <td align="left">RAW16</td> + * <td align="left">JPEG</td> + * <td align="left">DNG</td> + * </tr> + * </tbody> + * </table> + * <p>For ZSL-capable camera devices, using the RAW_OPAQUE format + * as either input or output will never hurt maximum frame rate (i.e. + * android.scaler.availableStallDurations will not have RAW_OPAQUE).</p> + * <p>Attempting to configure an input stream with output streams not + * listed as available in this map is not valid.</p> + * <p>TODO: Add java type mapping for this property.</p> + */ + public static final Key<int[]> SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP = + new Key<int[]>("android.scaler.availableInputOutputFormatsMap", int[].class); + + /** * <p>Area of raw data which corresponds to only * active pixels.</p> * <p>It is smaller or equal to |