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

Commit ef8993c0 authored by Rucha Katakwar's avatar Rucha Katakwar Committed by Android (Google) Code Review
Browse files

Merge "Camera: Flash strength contol during camera use." into main

parents fc995860 1c184e5a

core/api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -18646,6 +18646,10 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE;

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

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

    field @FlaggedApi("com.android.internal.camera.flags.camera_manual_flash_strength_control") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL;

    field @FlaggedApi("com.android.internal.camera.flags.camera_manual_flash_strength_control") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> FLASH_SINGLE_STRENGTH_MAX_LEVEL;

    field @FlaggedApi("com.android.internal.camera.flags.camera_manual_flash_strength_control") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> FLASH_TORCH_STRENGTH_DEFAULT_LEVEL;

    field @FlaggedApi("com.android.internal.camera.flags.camera_manual_flash_strength_control") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> FLASH_TORCH_STRENGTH_MAX_LEVEL;

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

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.DeviceStateSensorOrientationMap> INFO_DEVICE_STATE_SENSOR_ORIENTATION_MAP;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> INFO_SUPPORTED_HARDWARE_LEVEL;
@@ -19215,6 +19219,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> EDGE_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> EXTENSION_STRENGTH;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> FLASH_MODE;

    field @FlaggedApi("com.android.internal.camera.flags.camera_manual_flash_strength_control") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> FLASH_STRENGTH_LEVEL;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> HOT_PIXEL_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<android.location.Location> JPEG_GPS_LOCATION;

    field @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Integer> JPEG_ORIENTATION;
@@ -19310,6 +19315,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> EXTENSION_STRENGTH;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> FLASH_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> FLASH_STATE;

    field @FlaggedApi("com.android.internal.camera.flags.camera_manual_flash_strength_control") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> FLASH_STRENGTH_LEVEL;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> HOT_PIXEL_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.location.Location> JPEG_GPS_LOCATION;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> JPEG_ORIENTATION;

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

+68 −0
Original line number Diff line number Diff line
@@ -1406,6 +1406,74 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    public static final Key<Integer> FLASH_INFO_STRENGTH_DEFAULT_LEVEL =

            new Key<Integer>("android.flash.info.strengthDefaultLevel", int.class);



    /**

     * <p>Maximum flash brightness level for manual flash control in SINGLE mode.</p>

     * <p>Maximum flash brightness level in camera capture mode and

     * {@link CaptureRequest#FLASH_MODE android.flash.mode} set to SINGLE.

     * Value will be &gt; 1 if the manual flash strength control feature is supported,

     * otherwise the value will be equal to 1.

     * Note that this level is just a number of supported levels (the granularity of control).

     * There is no actual physical power units tied to this level.</p>

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

     *

     * @see CaptureRequest#FLASH_MODE

     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_CAMERA_MANUAL_FLASH_STRENGTH_CONTROL)

    public static final Key<Integer> FLASH_SINGLE_STRENGTH_MAX_LEVEL =

            new Key<Integer>("android.flash.singleStrengthMaxLevel", int.class);



    /**

     * <p>Default flash brightness level for manual flash control in SINGLE mode.</p>

     * <p>If flash unit is available this will be greater than or equal to 1 and less

     * or equal to <code>android.flash.info.singleStrengthMaxLevel</code>.

     * Note for devices that do not support the manual flash strength control

     * feature, this level will always be equal to 1.</p>

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

     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_CAMERA_MANUAL_FLASH_STRENGTH_CONTROL)

    public static final Key<Integer> FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL =

            new Key<Integer>("android.flash.singleStrengthDefaultLevel", int.class);



    /**

     * <p>Maximum flash brightness level for manual flash control in TORCH mode</p>

     * <p>Maximum flash brightness level in camera capture mode and

     * {@link CaptureRequest#FLASH_MODE android.flash.mode} set to TORCH.

     * Value will be &gt; 1 if the manual flash strength control feature is supported,

     * otherwise the value will be equal to 1.</p>

     * <p>Note that this level is just a number of supported levels(the granularity of control).

     * There is no actual physical power units tied to this level.

     * There is no relation between android.flash.info.torchStrengthMaxLevel and

     * android.flash.info.singleStrengthMaxLevel i.e. the ratio of

     * android.flash.info.torchStrengthMaxLevel:android.flash.info.singleStrengthMaxLevel

     * is not guaranteed to be the ratio of actual brightness.</p>

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

     *

     * @see CaptureRequest#FLASH_MODE

     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_CAMERA_MANUAL_FLASH_STRENGTH_CONTROL)

    public static final Key<Integer> FLASH_TORCH_STRENGTH_MAX_LEVEL =

            new Key<Integer>("android.flash.torchStrengthMaxLevel", int.class);



    /**

     * <p>Default flash brightness level for manual flash control in TORCH mode</p>

     * <p>If flash unit is available this will be greater than or equal to 1 and less

     * or equal to android.flash.info.torchStrengthMaxLevel.

     * Note for the devices that do not support the manual flash strength control feature,

     * this level will always be equal to 1.</p>

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

     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_CAMERA_MANUAL_FLASH_STRENGTH_CONTROL)

    public static final Key<Integer> FLASH_TORCH_STRENGTH_DEFAULT_LEVEL =

            new Key<Integer>("android.flash.torchStrengthDefaultLevel", int.class);



    /**

     * <p>List of hot pixel correction modes for {@link CaptureRequest#HOT_PIXEL_MODE android.hotPixel.mode} that are supported by this

     * camera device.</p>

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

+40 −0
Original line number Diff line number Diff line
@@ -2653,6 +2653,46 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
    public static final Key<Integer> FLASH_MODE =

            new Key<Integer>("android.flash.mode", int.class);



    /**

     * <p>Flash strength level to be used when manual flash control is active.</p>

     * <p>Flash strength level to use in capture mode i.e. when the applications control

     * flash with either SINGLE or TORCH mode.</p>

     * <p>Use android.flash.info.singleStrengthMaxLevel and

     * android.flash.info.torchStrengthMaxLevel to check whether the device supports

     * flash strength control or not.

     * If the values of android.flash.info.singleStrengthMaxLevel and

     * android.flash.info.torchStrengthMaxLevel are greater than 1,

     * then the device supports manual flash strength control.</p>

     * <p>If the {@link CaptureRequest#FLASH_MODE android.flash.mode} <code>==</code> TORCH the value must be &gt;= 1

     * and &lt;= android.flash.info.torchStrengthMaxLevel.

     * If the application doesn't set the key and

     * android.flash.info.torchStrengthMaxLevel &gt; 1,

     * then the flash will be fired at the default level set by HAL in

     * android.flash.info.torchStrengthDefaultLevel.

     * If the {@link CaptureRequest#FLASH_MODE android.flash.mode} <code>==</code> SINGLE, then the value must be &gt;= 1

     * and &lt;= android.flash.info.singleStrengthMaxLevel.

     * If the application does not set this key and

     * android.flash.info.singleStrengthMaxLevel &gt; 1,

     * then the flash will be fired at the default level set by HAL

     * in android.flash.info.singleStrengthDefaultLevel.

     * If {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} is set to any of ON_AUTO_FLASH, ON_ALWAYS_FLASH,

     * ON_AUTO_FLASH_REDEYE, ON_EXTERNAL_FLASH values, then the strengthLevel will be ignored.</p>

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

     * <code>[1-android.flash.info.torchStrengthMaxLevel]</code> when the {@link CaptureRequest#FLASH_MODE android.flash.mode} is

     * set to TORCH;

     * <code>[1-android.flash.info.singleStrengthMaxLevel]</code> when the {@link CaptureRequest#FLASH_MODE android.flash.mode} is

     * set to SINGLE</p>

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

     *

     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CaptureRequest#FLASH_MODE

     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_CAMERA_MANUAL_FLASH_STRENGTH_CONTROL)

    public static final Key<Integer> FLASH_STRENGTH_LEVEL =

            new Key<Integer>("android.flash.strengthLevel", int.class);



    /**

     * <p>Operational mode for hot pixel correction.</p>

     * <p>Hotpixel correction interpolates out, or otherwise removes, pixels

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

+40 −0
Original line number Diff line number Diff line
@@ -2939,6 +2939,46 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
    public static final Key<Integer> FLASH_STATE =

            new Key<Integer>("android.flash.state", int.class);



    /**

     * <p>Flash strength level to be used when manual flash control is active.</p>

     * <p>Flash strength level to use in capture mode i.e. when the applications control

     * flash with either SINGLE or TORCH mode.</p>

     * <p>Use android.flash.info.singleStrengthMaxLevel and

     * android.flash.info.torchStrengthMaxLevel to check whether the device supports

     * flash strength control or not.

     * If the values of android.flash.info.singleStrengthMaxLevel and

     * android.flash.info.torchStrengthMaxLevel are greater than 1,

     * then the device supports manual flash strength control.</p>

     * <p>If the {@link CaptureRequest#FLASH_MODE android.flash.mode} <code>==</code> TORCH the value must be &gt;= 1

     * and &lt;= android.flash.info.torchStrengthMaxLevel.

     * If the application doesn't set the key and

     * android.flash.info.torchStrengthMaxLevel &gt; 1,

     * then the flash will be fired at the default level set by HAL in

     * android.flash.info.torchStrengthDefaultLevel.

     * If the {@link CaptureRequest#FLASH_MODE android.flash.mode} <code>==</code> SINGLE, then the value must be &gt;= 1

     * and &lt;= android.flash.info.singleStrengthMaxLevel.

     * If the application does not set this key and

     * android.flash.info.singleStrengthMaxLevel &gt; 1,

     * then the flash will be fired at the default level set by HAL

     * in android.flash.info.singleStrengthDefaultLevel.

     * If {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} is set to any of ON_AUTO_FLASH, ON_ALWAYS_FLASH,

     * ON_AUTO_FLASH_REDEYE, ON_EXTERNAL_FLASH values, then the strengthLevel will be ignored.</p>

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

     * <code>[1-android.flash.info.torchStrengthMaxLevel]</code> when the {@link CaptureRequest#FLASH_MODE android.flash.mode} is

     * set to TORCH;

     * <code>[1-android.flash.info.singleStrengthMaxLevel]</code> when the {@link CaptureRequest#FLASH_MODE android.flash.mode} is

     * set to SINGLE</p>

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

     *

     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CaptureRequest#FLASH_MODE

     */

    @PublicKey

    @NonNull

    @FlaggedApi(Flags.FLAG_CAMERA_MANUAL_FLASH_STRENGTH_CONTROL)

    public static final Key<Integer> FLASH_STRENGTH_LEVEL =

            new Key<Integer>("android.flash.strengthLevel", int.class);



    /**

     * <p>Operational mode for hot pixel correction.</p>

     * <p>Hotpixel correction interpolates out, or otherwise removes, pixels