Merge "Camera: Add eyes-free videography metadata" into main (de2d3130) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ typedef enum acamera_metadata_section {
		ACAMERA_AUTOMOTIVE_LENS,
		ACAMERA_EXTENSION,
		ACAMERA_JPEGR,
		ACAMERA_EFV,
		ACAMERA_SECTION_COUNT,

		ACAMERA_VENDOR = 0x8000
		@@ -123,6 +124,7 @@ typedef enum acamera_metadata_section_start {
		ACAMERA_AUTOMOTIVE_LENS_START = ACAMERA_AUTOMOTIVE_LENS << 16,
		ACAMERA_EXTENSION_START = ACAMERA_EXTENSION << 16,
		ACAMERA_JPEGR_START = ACAMERA_JPEGR << 16,
		ACAMERA_EFV_START = ACAMERA_EFV << 16,
		ACAMERA_VENDOR_START = ACAMERA_VENDOR << 16
		} acamera_metadata_section_start_t;

		@@ -11527,6 +11529,7 @@ typedef enum acamera_metadata_enum_acamera_jpegr_available_jpeg_r_stream_configu




		__END_DECLS

		#endif /* _NDK_CAMERA_METADATA_TAGS_H */

+10 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ std::map<int, std::vector<camera_metadata_tag>> static_api_level_to_keys{
		ANDROID_CONTROL_AUTOFRAMING_AVAILABLE,
		ANDROID_CONTROL_AVAILABLE_SETTINGS_OVERRIDES,
		ANDROID_CONTROL_LOW_LIGHT_BOOST_INFO_LUMINANCE_RANGE,
		ANDROID_EFV_PADDING_ZOOM_FACTOR_RANGE,
		ANDROID_FLASH_SINGLE_STRENGTH_DEFAULT_LEVEL,
		ANDROID_FLASH_SINGLE_STRENGTH_MAX_LEVEL,
		ANDROID_FLASH_TORCH_STRENGTH_DEFAULT_LEVEL,
		@@ -112,6 +113,15 @@ std::map<int, std::vector<camera_metadata_tag>> dynamic_api_level_to_keys{
		ANDROID_CONTROL_LOW_LIGHT_BOOST_STATE,
		ANDROID_CONTROL_SETTINGS_OVERRIDE,
		ANDROID_CONTROL_SETTINGS_OVERRIDING_FRAME_NUMBER,
		ANDROID_EFV_AUTO_ZOOM,
		ANDROID_EFV_AUTO_ZOOM_PADDING_REGION,
		ANDROID_EFV_MAX_PADDING_ZOOM_FACTOR,
		ANDROID_EFV_PADDING_REGION,
		ANDROID_EFV_PADDING_ZOOM_FACTOR,
		ANDROID_EFV_ROTATE_VIEWPORT,
		ANDROID_EFV_STABILIZATION_MODE,
		ANDROID_EFV_TARGET_COORDINATES,
		ANDROID_EFV_TRANSLATE_VIEWPORT,
		ANDROID_EXTENSION_CURRENT_TYPE,
		ANDROID_EXTENSION_STRENGTH,
		ANDROID_FLASH_STRENGTH_LEVEL,