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

Commit 7021b7e3 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android (Google) Code Review
Browse files

Merge "Camera2: lens shading related HAL3.3 update"

parents 00591330 e4aa2831

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -12791,6 +12791,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.graphics.Rect> SENSOR_INFO_ACTIVE_ARRAY_SIZE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_COLOR_FILTER_ARRANGEMENT;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Long>> SENSOR_INFO_EXPOSURE_TIME_RANGE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> SENSOR_INFO_LENS_SHADING_APPLIED;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Long> SENSOR_INFO_MAX_FRAME_DURATION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.SizeF> SENSOR_INFO_PHYSICAL_SIZE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size> SENSOR_INFO_PIXEL_ARRAY_SIZE;
@@ -12801,8 +12802,10 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_ORIENTATION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_REFERENCE_ILLUMINANT1;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> SENSOR_REFERENCE_ILLUMINANT2;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SHADING_AVAILABLE_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<boolean[]> STATISTICS_INFO_AVAILABLE_HOT_PIXEL_MAP_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<byte[]> STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> STATISTICS_INFO_MAX_FACE_COUNT;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SYNC_MAX_LATENCY;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> TONEMAP_AVAILABLE_TONE_MAP_MODES;

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -13063,6 +13063,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.graphics.Rect> SENSOR_INFO_ACTIVE_ARRAY_SIZE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_INFO_COLOR_FILTER_ARRANGEMENT;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Range<java.lang.Long>> SENSOR_INFO_EXPOSURE_TIME_RANGE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> SENSOR_INFO_LENS_SHADING_APPLIED;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Long> SENSOR_INFO_MAX_FRAME_DURATION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.SizeF> SENSOR_INFO_PHYSICAL_SIZE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size> SENSOR_INFO_PIXEL_ARRAY_SIZE;
@@ -13073,8 +13074,10 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_ORIENTATION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SENSOR_REFERENCE_ILLUMINANT1;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> SENSOR_REFERENCE_ILLUMINANT2;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SHADING_AVAILABLE_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<boolean[]> STATISTICS_INFO_AVAILABLE_HOT_PIXEL_MAP_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<byte[]> STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> STATISTICS_INFO_MAX_FACE_COUNT;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SYNC_MAX_LATENCY;

    field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> TONEMAP_AVAILABLE_TONE_MAP_MODES;

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

+50 −0
Original line number Diff line number Diff line
@@ -1942,6 +1942,23 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<Integer> SENSOR_INFO_TIMESTAMP_SOURCE =

            new Key<Integer>("android.sensor.info.timestampSource", int.class);



    /**

     * <p>Whether the RAW images output from this camera device are subject to

     * lens shading correction.</p>

     * <p>If TRUE, all images produced by the camera device in the RAW image formats will

     * have lens shading correction already applied to it. If FALSE, the images will

     * not be adjusted for lens shading correction.

     * See {@link CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_RAW android.request.maxNumOutputRaw} for a list of RAW image formats.</p>

     * <p>This key will be <code>null</code> for all devices do not report this information.

     * Devices with RAW capability will always report this information in this key.</p>

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

     *

     * @see CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_RAW

     */

    @PublicKey

    public static final Key<Boolean> SENSOR_INFO_LENS_SHADING_APPLIED =

            new Key<Boolean>("android.sensor.info.lensShadingApplied", boolean.class);



    /**

     * <p>The standard reference illuminant used as the scene light source when

     * calculating the {@link CameraCharacteristics#SENSOR_COLOR_TRANSFORM1 android.sensor.colorTransform1},
@@ -2232,6 +2249,22 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<int[]> SENSOR_AVAILABLE_TEST_PATTERN_MODES =

            new Key<int[]>("android.sensor.availableTestPatternModes", int[].class);



    /**

     * <p>List of lens shading modes for {@link CaptureRequest#SHADING_MODE android.shading.mode} that are supported by this camera device.</p>

     * <p>This list contains lens shading modes that can be set for the camera device.

     * Camera devices that support the MANUAL_POST_PROCESSING capability will always

     * list OFF and FAST mode. This includes all FULL level devices.

     * LEGACY devices will always only support FAST mode.</p>

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

     * Any value listed in {@link CaptureRequest#SHADING_MODE android.shading.mode}</p>

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

     *

     * @see CaptureRequest#SHADING_MODE

     */

    @PublicKey

    public static final Key<int[]> SHADING_AVAILABLE_MODES =

            new Key<int[]>("android.shading.availableModes", int[].class);



    /**

     * <p>List of face detection modes for {@link CaptureRequest#STATISTICS_FACE_DETECT_MODE android.statistics.faceDetectMode} that are

     * supported by this camera device.</p>
@@ -2275,6 +2308,23 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<boolean[]> STATISTICS_INFO_AVAILABLE_HOT_PIXEL_MAP_MODES =

            new Key<boolean[]>("android.statistics.info.availableHotPixelMapModes", boolean[].class);



    /**

     * <p>List of lens shading map output modes for {@link CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE android.statistics.lensShadingMapMode} that

     * are supported by this camera device.</p>

     * <p>If no lens shading map output is available for this camera device, this key will

     * contain only OFF.</p>

     * <p>ON is always supported on devices with the RAW capability.

     * LEGACY mode devices will always only support OFF.</p>

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

     * Any value listed in {@link CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE android.statistics.lensShadingMapMode}</p>

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

     *

     * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE

     */

    @PublicKey

    public static final Key<byte[]> STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES =

            new Key<byte[]>("android.statistics.info.availableLensShadingMapModes", byte[].class);



    /**

     * <p>Maximum number of supported points in the

     * tonemap curve that can be used for {@link CaptureRequest#TONEMAP_CURVE android.tonemap.curve}.</p>

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

+6 −0
Original line number Diff line number Diff line
@@ -2118,6 +2118,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     *   <li>{@link #SHADING_MODE_FAST FAST}</li>

     *   <li>{@link #SHADING_MODE_HIGH_QUALITY HIGH_QUALITY}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#SHADING_AVAILABLE_MODES android.shading.availableModes}</p>

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

     * <p><b>Full capability</b> -

     * Present on all camera devices that report being {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL} devices in the
@@ -2126,6 +2128,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CaptureRequest#CONTROL_AWB_MODE

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see CameraCharacteristics#SHADING_AVAILABLE_MODES

     * @see CaptureResult#STATISTICS_LENS_SHADING_CORRECTION_MAP

     * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE

     * @see #SHADING_MODE_OFF
@@ -2188,12 +2191,15 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     *   <li>{@link #STATISTICS_LENS_SHADING_MAP_MODE_OFF OFF}</li>

     *   <li>{@link #STATISTICS_LENS_SHADING_MAP_MODE_ON ON}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES android.statistics.info.availableLensShadingMapModes}</p>

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

     * <p><b>Full capability</b> -

     * Present on all camera devices that report being {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL} devices in the

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>

     *

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see CameraCharacteristics#STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES

     * @see #STATISTICS_LENS_SHADING_MAP_MODE_OFF

     * @see #STATISTICS_LENS_SHADING_MAP_MODE_ON

     */

core/java/android/hardware/camera2/CaptureResult.java

+22 −2
Original line number Diff line number Diff line
@@ -3054,6 +3054,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *   <li>{@link #SHADING_MODE_FAST FAST}</li>

     *   <li>{@link #SHADING_MODE_HIGH_QUALITY HIGH_QUALITY}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#SHADING_AVAILABLE_MODES android.shading.availableModes}</p>

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

     * <p><b>Full capability</b> -

     * Present on all camera devices that report being {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL} devices in the
@@ -3062,6 +3064,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CaptureRequest#CONTROL_AWB_MODE

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see CameraCharacteristics#SHADING_AVAILABLE_MODES

     * @see CaptureResult#STATISTICS_LENS_SHADING_CORRECTION_MAP

     * @see CaptureRequest#STATISTICS_LENS_SHADING_MAP_MODE

     * @see #SHADING_MODE_OFF
@@ -3225,7 +3228,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
    /**

     * <p>The shading map is a low-resolution floating-point map

     * that lists the coefficients used to correct for vignetting, for each

     * Bayer color channel.</p>

     * Bayer color channel of RAW image data.</p>

     * <p>The least shaded section of the image should have a gain factor

     * of 1; all other sections should have gains above 1.</p>

     * <p>When {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode} = TRANSFORM_MATRIX, the map
@@ -3261,8 +3264,20 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <img alt="Green (odd rows) lens shading map" src="../../../../images/camera2/metadata/android.statistics.lensShadingMap/green_o_shading.png" />

     * <img alt="Blue lens shading map" src="../../../../images/camera2/metadata/android.statistics.lensShadingMap/blue_shading.png" /></p>

     * <p>As a visualization only, inverting the full-color map to recover an

     * image of a gray wall (using bicubic interpolation for visual quality) as captured by the sensor gives:</p>

     * image of a gray wall (using bicubic interpolation for visual quality)

     * as captured by the sensor gives:</p>

     * <p><img alt="Image of a uniform white wall (inverse shading map)" src="../../../../images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png" /></p>

     * <p>Note that the RAW image data might be subject to lens shading

     * correction not reported on this map. Query

     * {@link CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED android.sensor.info.lensShadingApplied} to see if RAW image data has subject

     * to lens shading correction. If {@link CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED android.sensor.info.lensShadingApplied}

     * is TRUE, the RAW image data is subject to partial or full lens shading

     * correction. In the case full lens shading correction is applied to RAW

     * images, the gain factor map reported in this key will contain all 1.0 gains.

     * In other words, the map reported in this key is the remaining lens shading

     * that needs to be applied on the RAW image to get images without lens shading

     * artifacts. See {@link CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_RAW android.request.maxNumOutputRaw} for a list of RAW image

     * formats.</p>

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

     * Each gain factor is &gt;= 1</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
@@ -3272,6 +3287,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *

     * @see CaptureRequest#COLOR_CORRECTION_MODE

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see CameraCharacteristics#REQUEST_MAX_NUM_OUTPUT_RAW

     * @see CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED

     * @hide

     */

    public static final Key<float[]> STATISTICS_LENS_SHADING_MAP =
@@ -3409,12 +3426,15 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     *   <li>{@link #STATISTICS_LENS_SHADING_MAP_MODE_OFF OFF}</li>

     *   <li>{@link #STATISTICS_LENS_SHADING_MAP_MODE_ON ON}</li>

     * </ul></p>

     * <p><b>Available values for this device:</b><br>

     * {@link CameraCharacteristics#STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES android.statistics.info.availableLensShadingMapModes}</p>

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

     * <p><b>Full capability</b> -

     * Present on all camera devices that report being {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_FULL HARDWARE_LEVEL_FULL} devices in the

     * {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL android.info.supportedHardwareLevel} key</p>

     *

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL

     * @see CameraCharacteristics#STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES

     * @see #STATISTICS_LENS_SHADING_MAP_MODE_OFF

     * @see #STATISTICS_LENS_SHADING_MAP_MODE_ON

     */