Merge "Camera: Add extension related metadata tags" (474c3304) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraMetadataTags.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ typedef enum acamera_metadata_section {
		ACAMERA_HEIC_INFO,
		ACAMERA_AUTOMOTIVE,
		ACAMERA_AUTOMOTIVE_LENS,
		ACAMERA_EXTENSION,
		ACAMERA_SECTION_COUNT,

		ACAMERA_VENDOR = 0x8000
		@@ -119,6 +120,7 @@ typedef enum acamera_metadata_section_start {
		ACAMERA_HEIC_INFO_START = ACAMERA_HEIC_INFO << 16,
		ACAMERA_AUTOMOTIVE_START = ACAMERA_AUTOMOTIVE << 16,
		ACAMERA_AUTOMOTIVE_LENS_START = ACAMERA_AUTOMOTIVE_LENS << 16,
		ACAMERA_EXTENSION_START = ACAMERA_EXTENSION << 16,
		ACAMERA_VENDOR_START = ACAMERA_VENDOR << 16
		} acamera_metadata_section_start_t;

		@@ -10989,6 +10991,7 @@ typedef enum acamera_metadata_enum_acamera_automotive_lens_facing {




		__END_DECLS

		#endif /* _NDK_CAMERA_METADATA_TAGS_H */

+2 −0

Original line number	Diff line number	Diff line
		@@ -100,5 +100,7 @@ std::map<int, std::vector<camera_metadata_tag>> dynamic_api_level_to_keys{
		ANDROID_CONTROL_AUTOFRAMING_STATE,
		ANDROID_CONTROL_SETTINGS_OVERRIDE,
		ANDROID_CONTROL_SETTINGS_OVERRIDING_FRAME_NUMBER,
		ANDROID_EXTENSION_CURRENT_TYPE,
		ANDROID_EXTENSION_STRENGTH,
		} },
		};