Merge "camera2 ndk: Fix enum values which were incorrectly auto-generated" into main (07eb09c6) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+24 −9

Original line number	Diff line number	Diff line
		@@ -40,6 +40,21 @@

		__BEGIN_DECLS

		/*
		* Note: The following enum values were incorrect and have been updated:
		* enum old value updated value
		* ACAMERA_CONTROL_SETTINGS_OVERRIDE ACAMERA_CONTROL_START + 49 ACAMERA_CONTROL_START + 52;
		* ACAMERA_CONTROL_AVAILABLE_SETTINGS_OVERRIDES ACAMERA_CONTROL_START + 50 ACAMERA_CONTROL_START + 53;
		* ACAMERA_CONTROL_AUTOFRAMING ACAMERA_CONTROL_START + 52 ACAMERA_CONTROL_START + 55;
		* ACAMERA_CONTROL_AUTOFRAMING_AVAILABLE ACAMERA_CONTROL_START + 53 ACAMERA_CONTROL_START + 56;
		* ACAMERA_CONTROL_AUTOFRAMING_STATE ACAMERA_CONTROL_START + 54 ACAMERA_CONTROL_START + 57;
		* ACAMERA_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE ACAMERA_CONTROL_START + 55 ACAMERA_CONTROL_START + 58;
		* ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE ACAMERA_CONTROL_START + 56 ACAMERA_CONTROL_START + 59;

		* ACAMERA_SCALER_AVAILABLE_STREAM_USE_CASES ACAMERA_SCALER_START + 25 ACAMERA_SCALER_START + 26;
		* ACAMERA_SCALER_CROP_REGION ACAMERA_SCALER_START + 26 ACAMERA_SCALER_START + 27;
		*/


		typedef enum acamera_metadata_section {
		ACAMERA_COLOR_CORRECTION,
		@@ -2147,7 +2162,7 @@ typedef enum acamera_metadata_tag {
		* </ul>
		*/
		ACAMERA_CONTROL_SETTINGS_OVERRIDE = // int32 (acamera_metadata_enum_android_control_settings_override_t)
		ACAMERA_CONTROL_START + 49,
		ACAMERA_CONTROL_START + 52,
		/**
		* <p>List of available settings overrides supported by the camera device that can
		* be used to speed up certain controls.</p>
		@@ -2173,7 +2188,7 @@ typedef enum acamera_metadata_tag {
		* @see ACAMERA_CONTROL_SETTINGS_OVERRIDE
		*/
		ACAMERA_CONTROL_AVAILABLE_SETTINGS_OVERRIDES = // int32[n]
		ACAMERA_CONTROL_START + 50,
		ACAMERA_CONTROL_START + 53,
		/**
		* <p>Automatic crop, pan and zoom to keep objects in the center of the frame.</p>
		*
		@@ -2200,7 +2215,7 @@ typedef enum acamera_metadata_tag {
		* @see ACAMERA_SCALER_CROP_REGION
		*/
		ACAMERA_CONTROL_AUTOFRAMING = // byte (acamera_metadata_enum_android_control_autoframing_t)
		ACAMERA_CONTROL_START + 52,
		ACAMERA_CONTROL_START + 55,
		/**
		* <p>Whether the camera device supports ACAMERA_CONTROL_AUTOFRAMING.</p>
		*
		@@ -2216,7 +2231,7 @@ typedef enum acamera_metadata_tag {
		* <p>Will be <code>false</code> if auto-framing is not available.</p>
		*/
		ACAMERA_CONTROL_AUTOFRAMING_AVAILABLE = // byte (acamera_metadata_enum_android_control_autoframing_available_t)
		ACAMERA_CONTROL_START + 53,
		ACAMERA_CONTROL_START + 56,
		/**
		* <p>Current state of auto-framing.</p>
		*
		@@ -2243,7 +2258,7 @@ typedef enum acamera_metadata_tag {
		* @see ACAMERA_CONTROL_AUTOFRAMING_AVAILABLE
		*/
		ACAMERA_CONTROL_AUTOFRAMING_STATE = // byte (acamera_metadata_enum_android_control_autoframing_state_t)
		ACAMERA_CONTROL_START + 54,
		ACAMERA_CONTROL_START + 57,
		/**
		* <p>The operating luminance range of low light boost measured in lux (lx).</p>
		*
		@@ -2256,7 +2271,7 @@ typedef enum acamera_metadata_tag {
		*
		*/
		ACAMERA_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE = // float[2]
		ACAMERA_CONTROL_START + 55,
		ACAMERA_CONTROL_START + 58,
		/**
		* <p>Current state of the low light boost AE mode.</p>
		*
		@@ -2276,7 +2291,7 @@ typedef enum acamera_metadata_tag {
		* 'ON_LOW_LIGHT_BOOST_BRIGHTNESS_PRIORITY.</p>
		*/
		ACAMERA_CONTROL_LOW_LIGHT_BOOST_STATE = // byte (acamera_metadata_enum_android_control_low_light_boost_state_t)
		ACAMERA_CONTROL_START + 56,
		ACAMERA_CONTROL_START + 59,
		ACAMERA_CONTROL_END,

		/**
		@@ -4669,7 +4684,7 @@ typedef enum acamera_metadata_tag {
		* application should leave stream use cases within the session as DEFAULT.</p>
		*/
		ACAMERA_SCALER_AVAILABLE_STREAM_USE_CASES = // int64[n] (acamera_metadata_enum_android_scaler_available_stream_use_cases_t)
		ACAMERA_SCALER_START + 25,
		ACAMERA_SCALER_START + 26,
		/**
		* <p>The region of the sensor that corresponds to the RAW read out for this
		* capture when the stream use case of a RAW stream is set to CROPPED_RAW.</p>
		@@ -4722,7 +4737,7 @@ typedef enum acamera_metadata_tag {
		* @see ACAMERA_STATISTICS_HOT_PIXEL_MAP
		*/
		ACAMERA_SCALER_RAW_CROP_REGION = // int32[4]
		ACAMERA_SCALER_START + 26,
		ACAMERA_SCALER_START + 27,
		ACAMERA_SCALER_END,

		/**