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

Commit b5138766 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Enhance support for monochrome camera"

parents 99b5308d a8d36036

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -16628,6 +16628,8 @@ package android.hardware.camera2 { 
    field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_BGGR = 3; // 0x3

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

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

    field public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_MONO = 5; // 0x5

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

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

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

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

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

+24 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import android.hardware.camera2.utils.ArrayUtils; 
import android.hardware.camera2.utils.TypeReference;

import android.util.Rational;



import java.util.Arrays;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.HashSet;

import java.util.List;
@@ -2668,7 +2668,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    /**

     * <p>The arrangement of color filters on sensor;

     * represents the colors in the top-left 2x2 section of

     * the sensor, in reading order.</p>

     * the sensor, in reading order, for a Bayer camera, or the

     * light spectrum it captures for MONOCHROME camera.</p>

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

     * <ul>

     *   <li>{@link #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGGB RGGB}</li>
@@ -2676,6 +2677,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     *   <li>{@link #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_GBRG GBRG}</li>

     *   <li>{@link #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_BGGR BGGR}</li>

     *   <li>{@link #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGB RGB}</li>

     *   <li>{@link #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_MONO MONO}</li>

     *   <li>{@link #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR NIR}</li>

     * </ul></p>

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

     * <p><b>Full capability</b> -
@@ -2688,6 +2691,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * @see #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_GBRG

     * @see #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_BGGR

     * @see #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGB

     * @see #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_MONO

     * @see #SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR

     */

    @PublicKey

    public static final Key<Integer> SENSOR_INFO_COLOR_FILTER_ARRANGEMENT =
@@ -2919,6 +2924,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>Some devices may choose to provide a second set of calibration

     * information for improved quality, including

     * {@link CameraCharacteristics#SENSOR_REFERENCE_ILLUMINANT2 android.sensor.referenceIlluminant2} and its corresponding matrices.</p>

     * <p>Starting from Android Q, this key will not be present for a MONOCHROME camera, even if

     * the camera device has RAW capability.</p>

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

     * <ul>

     *   <li>{@link #SENSOR_REFERENCE_ILLUMINANT1_DAYLIGHT DAYLIGHT}</li>
@@ -2981,6 +2988,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>If this key is present, then {@link CameraCharacteristics#SENSOR_COLOR_TRANSFORM2 android.sensor.colorTransform2},

     * {@link CameraCharacteristics#SENSOR_CALIBRATION_TRANSFORM2 android.sensor.calibrationTransform2}, and

     * {@link CameraCharacteristics#SENSOR_FORWARD_MATRIX2 android.sensor.forwardMatrix2} will also be present.</p>

     * <p>Starting from Android Q, this key will not be present for a MONOCHROME camera, even if

     * the camera device has RAW capability.</p>

     * <p><b>Range of valid values:</b><br>

     * Any value listed in {@link CameraCharacteristics#SENSOR_REFERENCE_ILLUMINANT1 android.sensor.referenceIlluminant1}</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
@@ -3006,6 +3015,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * colorspace) into this camera device's native sensor color

     * space under the first reference illuminant

     * ({@link CameraCharacteristics#SENSOR_REFERENCE_ILLUMINANT1 android.sensor.referenceIlluminant1}).</p>

     * <p>Starting from Android Q, this key will not be present for a MONOCHROME camera, even if

     * the camera device has RAW capability.</p>

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

     * <p><b>Permission {@link android.Manifest.permission#CAMERA } is needed to access this property</b></p>

     *
@@ -3029,6 +3040,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * ({@link CameraCharacteristics#SENSOR_REFERENCE_ILLUMINANT2 android.sensor.referenceIlluminant2}).</p>

     * <p>This matrix will only be present if the second reference

     * illuminant is present.</p>

     * <p>Starting from Android Q, this key will not be present for a MONOCHROME camera, even if

     * the camera device has RAW capability.</p>

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

     * <p><b>Permission {@link android.Manifest.permission#CAMERA } is needed to access this property</b></p>

     *
@@ -3053,6 +3066,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * and the CIE XYZ colorspace when calculating this transform will

     * match the standard white point for the first reference illuminant

     * (i.e. no chromatic adaptation will be applied by this transform).</p>

     * <p>Starting from Android Q, this key will not be present for a MONOCHROME camera, even if

     * the camera device has RAW capability.</p>

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

     * <p><b>Permission {@link android.Manifest.permission#CAMERA } is needed to access this property</b></p>

     *
@@ -3079,6 +3094,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * (i.e. no chromatic adaptation will be applied by this transform).</p>

     * <p>This matrix will only be present if the second reference

     * illuminant is present.</p>

     * <p>Starting from Android Q, this key will not be present for a MONOCHROME camera, even if

     * the camera device has RAW capability.</p>

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

     * <p><b>Permission {@link android.Manifest.permission#CAMERA } is needed to access this property</b></p>

     *
@@ -3101,6 +3118,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * this matrix is chosen so that the standard white point for this reference

     * illuminant in the reference sensor colorspace is mapped to D50 in the

     * CIE XYZ colorspace.</p>

     * <p>Starting from Android Q, this key will not be present for a MONOCHROME camera, even if

     * the camera device has RAW capability.</p>

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

     * <p><b>Permission {@link android.Manifest.permission#CAMERA } is needed to access this property</b></p>

     *
@@ -3125,6 +3144,8 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * CIE XYZ colorspace.</p>

     * <p>This matrix will only be present if the second reference

     * illuminant is present.</p>

     * <p>Starting from Android Q, this key will not be present for a MONOCHROME camera, even if

     * the camera device has RAW capability.</p>

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

     * <p><b>Permission {@link android.Manifest.permission#CAMERA } is needed to access this property</b></p>

     *
@@ -3153,6 +3174,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * level values. For raw capture in particular, it is recommended to use

     * pixels from {@link CameraCharacteristics#SENSOR_OPTICAL_BLACK_REGIONS android.sensor.opticalBlackRegions} to calculate black

     * level values for each frame.</p>

     * <p>For a MONOCHROME camera device, all of the 2x2 channels must have the same values.</p>

     * <p><b>Range of valid values:</b><br>

     * &gt;= 0 for each.</p>

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

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

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * </p>

     *

     * <p>MONOCHROME-capability ({@link CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES}

     * includes {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME MONOCHROME})

     * includes {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME MONOCHROME}) devices

     * supporting {@link android.graphics.ImageFormat#Y8 Y8} support substituting {@code YUV}

     * streams with {@code Y8} in all guaranteed stream combinations for the device's hardware level

     * and capabilities.</p>

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

+23 −2
Original line number Diff line number Diff line
@@ -880,11 +880,15 @@ public abstract class CameraMetadata<TKey> { 


    /**

     * <p>The camera device is a monochrome camera that doesn't contain a color filter array,

     * and the pixel values on U and V planes are all 128.</p>

     * and for YUV_420_888 stream, the pixel values on U and V planes are all 128.</p>

     * <p>A MONOCHROME camera must support the guaranteed stream combinations required for

     * its device level and capabilities. Additionally, if the monochrome camera device

     * supports Y8 format, all mandatory stream combination requirements related to {@link android.graphics.ImageFormat#YUV_420_888 YUV_420_888} apply

     * to {@link android.graphics.ImageFormat#Y8 Y8} as well.</p>

     * to {@link android.graphics.ImageFormat#Y8 Y8} as well. There are no

     * mandatory stream combination requirements with regard to

     * {@link android.graphics.ImageFormat#Y8 Y8} for Bayer camera devices.</p>

     * <p>Starting from Android Q, the SENSOR_INFO_COLOR_FILTER_ARRANGEMENT of a MONOCHROME

     * camera will be either MONO or NIR.</p>

     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES

     */

    public static final int REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME = 12;
@@ -937,6 +941,23 @@ public abstract class CameraMetadata<TKey> { 
     */

    public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_RGB = 4;



    /**

     * <p>Sensor doesn't have any Bayer color filter.

     * Such sensor captures visible light in monochrome. The exact weighting and

     * wavelengths captured is not specified, but generally only includes the visible

     * frequencies. This value implies a MONOCHROME camera.</p>

     * @see CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT

     */

    public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_MONO = 5;



    /**

     * <p>Sensor has a near infrared filter capturing light with wavelength between

     * roughly 750nm and 1400nm, and the same filter covers the whole sensor array. This

     * value implies a MONOCHROME camera.</p>

     * @see CameraCharacteristics#SENSOR_INFO_COLOR_FILTER_ARRANGEMENT

     */

    public static final int SENSOR_INFO_COLOR_FILTER_ARRANGEMENT_NIR = 6;



    //

    // Enumeration values for CameraCharacteristics#SENSOR_INFO_TIMESTAMP_SOURCE

    //

core/java/android/hardware/camera2/CaptureRequest.java

+5 −5
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import android.hardware.camera2.impl.PublicKey; 
import android.hardware.camera2.impl.SyntheticKey;

import android.hardware.camera2.params.OutputConfiguration;

import android.hardware.camera2.utils.HashCodeHelpers;

import android.hardware.camera2.utils.TypeReference;

import android.hardware.camera2.utils.SurfaceUtils;

import android.hardware.camera2.utils.TypeReference;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.ArraySet;
@@ -2947,8 +2947,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * of points can be less than max (that is, the request doesn't have to

     * always provide a curve with number of points equivalent to

     * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}).</p>

     * <p>For devices with MONOCHROME capability, only red channel is used. Green and blue channels

     * are ignored.</p>

     * <p>For devices with MONOCHROME capability, all three channels must have the same set of

     * control points.</p>

     * <p>A few examples, and their corresponding graphical mappings; these

     * only specify the red channel and the precision is limited to 4

     * digits, for conciseness.</p>
@@ -3011,8 +3011,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * of points can be less than max (that is, the request doesn't have to

     * always provide a curve with number of points equivalent to

     * {@link CameraCharacteristics#TONEMAP_MAX_CURVE_POINTS android.tonemap.maxCurvePoints}).</p>

     * <p>For devices with MONOCHROME capability, only red channel is used. Green and blue channels

     * are ignored.</p>

     * <p>For devices with MONOCHROME capability, all three channels must have the same set of

     * control points.</p>

     * <p>A few examples, and their corresponding graphical mappings; these

     * only specify the red channel and the precision is limited to 4

     * digits, for conciseness.</p>