From 5bc9ff8aaec75bb30ca741d56e91615c1c28ba42 Mon Sep 17 00:00:00 2001 From: Chien-Yu Chen Date: Thu, 15 Mar 2018 11:16:33 -0700 Subject: [PATCH] camera: Add links for aeState Test: Build Bug: 74976641 Change-Id: I71d7605fcd0de8876140804e53c6f8ee1576a512 --- camera/ndk/include/camera/NdkCameraMetadataTags.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/camera/ndk/include/camera/NdkCameraMetadataTags.h b/camera/ndk/include/camera/NdkCameraMetadataTags.h index 839b1349fe..940ac5fdf4 100644 --- a/camera/ndk/include/camera/NdkCameraMetadataTags.h +++ b/camera/ndk/include/camera/NdkCameraMetadataTags.h @@ -1309,8 +1309,8 @@ typedef enum acamera_metadata_tag { * Any state (excluding LOCKED) | ACAMERA_CONTROL_AE_PRECAPTURE_TRIGGER is START | PRECAPTURE | Start AE precapture metering sequence * Any state (excluding LOCKED) | ACAMERA_CONTROL_AE_PRECAPTURE_TRIGGER is CANCEL| INACTIVE | Currently active precapture metering sequence is canceled

*

If the camera device supports AE external flash mode (ON_EXTERNAL_FLASH is included in - * ACAMERA_CONTROL_AE_AVAILABLE_MODES), aeState must be FLASH_REQUIRED after the camera device - * finishes AE scan and it's too dark without flash.

+ * ACAMERA_CONTROL_AE_AVAILABLE_MODES), ACAMERA_CONTROL_AE_STATE must be FLASH_REQUIRED after + * the camera device finishes AE scan and it's too dark without flash.

*

For the above table, the camera device may skip reporting any state changes that happen * without application intervention (i.e. mode switch, trigger, locking). Any state that * can be skipped in that manner is called a transient state.

@@ -1331,6 +1331,7 @@ typedef enum acamera_metadata_tag { * @see ACAMERA_CONTROL_AE_LOCK * @see ACAMERA_CONTROL_AE_MODE * @see ACAMERA_CONTROL_AE_PRECAPTURE_TRIGGER + * @see ACAMERA_CONTROL_AE_STATE * @see ACAMERA_CONTROL_MODE * @see ACAMERA_CONTROL_SCENE_MODE */ @@ -5500,9 +5501,11 @@ typedef enum acamera_metadata_enum_acamera_control_ae_mode { * for the external flash. Otherwise, this mode acts like ON.

*

When the external flash is turned off, AE mode should be changed to one of the * other available AE modes.

- *

If the camera device supports AE external flash mode, aeState must be - * FLASH_REQUIRED after the camera device finishes AE scan and it's too dark without + *

If the camera device supports AE external flash mode, ACAMERA_CONTROL_AE_STATE must + * be FLASH_REQUIRED after the camera device finishes AE scan and it's too dark without * flash.

+ * + * @see ACAMERA_CONTROL_AE_STATE */ ACAMERA_CONTROL_AE_MODE_ON_EXTERNAL_FLASH = 5,