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

Commit 5b59654d authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "camera2: Fix broken doc links for flash strength apis" into main

parents 4b418fd2 f83d9812

camera/ndk/include/camera/NdkCameraMetadataTags.h

+24 −14
Original line number Diff line number Diff line
@@ -2429,29 +2429,33 @@ typedef enum acamera_metadata_tag { 
     *

     * <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

     * <p>Use ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL and

     * ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL 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,

     * ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL are greater than 1,

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

     * <p>If the ACAMERA_FLASH_MODE <code>==</code> TORCH the value must be &gt;= 1

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

     * and &lt;= ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL.

     * If the application doesn't set the key and

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

     * ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL &gt; 1,

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

     * android.flash.info.torchStrengthDefaultLevel.

     * ACAMERA_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL.

     * If the ACAMERA_FLASH_MODE <code>==</code> SINGLE, then the value must be &gt;= 1

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

     * and &lt;= ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL.

     * If the application does not set this key and

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

     * ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL &gt; 1,

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

     * in android.flash.info.singleStrengthDefaultLevel.

     * in ACAMERA_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL.

     * If ACAMERA_CONTROL_AE_MODE 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>

     *

     * @see ACAMERA_CONTROL_AE_MODE

     * @see ACAMERA_FLASH_MODE

     * @see ACAMERA_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL

     * @see ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL

     * @see ACAMERA_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL

     * @see ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL

     */

    ACAMERA_FLASH_STRENGTH_LEVEL =                              // int32

            ACAMERA_FLASH_START + 6,
@@ -2487,9 +2491,11 @@ typedef enum acamera_metadata_tag { 
     * </ul></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>.

     * or equal to ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL.

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

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

     *

     * @see ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL

     */

    ACAMERA_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL =               // int32

            ACAMERA_FLASH_START + 8,
@@ -2509,12 +2515,14 @@ typedef enum acamera_metadata_tag { 
     * 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

     * There is no relation between ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL and

     * ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL i.e. the ratio of

     * ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL:ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL

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

     *

     * @see ACAMERA_FLASH_MODE

     * @see ACAMERA_FLASH_SINGLE_STRENGTH_MAX_LEVEL

     * @see ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL

     */

    ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL =                    // int32

            ACAMERA_FLASH_START + 9,
@@ -2529,9 +2537,11 @@ typedef enum acamera_metadata_tag { 
     * </ul></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.

     * or equal to ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL.

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

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

     *

     * @see ACAMERA_FLASH_TORCH_STRENGTH_MAX_LEVEL

     */

    ACAMERA_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL =                // int32

            ACAMERA_FLASH_START + 10,