Merge "Camera: Add color temperature metadata tags" into main (888817a9) · Commits · e / os / android_hardware_interfaces

camera/metadata/aidl/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ aidl_interface {
		host_supported: true,
		vendor_available: true,
		srcs: ["android/hardware/camera/metadata/*.aidl"],
		frozen: true,
		frozen: false,
		stability: "vintf",
		backend: {
		cpp: {

+4 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,10 @@ enum CameraMetadataTag {
		ANDROID_COLOR_CORRECTION_GAINS,
		ANDROID_COLOR_CORRECTION_ABERRATION_MODE,
		ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,
		ANDROID_COLOR_CORRECTION_COLOR_TEMPERATURE,
		ANDROID_COLOR_CORRECTION_COLOR_TINT,
		ANDROID_COLOR_CORRECTION_COLOR_TEMPERATURE_RANGE,
		ANDROID_COLOR_CORRECTION_AVAILABLE_MODES,
		ANDROID_CONTROL_AE_ANTIBANDING_MODE = android.hardware.camera.metadata.CameraMetadataSectionStart.ANDROID_CONTROL_START /* 65536 */,
		ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION,
		ANDROID_CONTROL_AE_LOCK,

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,4 +41,5 @@ enum ColorCorrectionMode {
		ANDROID_COLOR_CORRECTION_MODE_TRANSFORM_MATRIX,
		ANDROID_COLOR_CORRECTION_MODE_FAST,
		ANDROID_COLOR_CORRECTION_MODE_HIGH_QUALITY,
		ANDROID_COLOR_CORRECTION_MODE_CCT,
		}

+32 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,38 @@ enum CameraMetadataTag {
		* @see ANDROID_COLOR_CORRECTION_ABERRATION_MODE
		*/
		ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,
		/**
		* android.colorCorrection.colorTemperature [dynamic, int32, public]
		*
		* <p>Specifies the color temperature for CCT mode in Kelvin
		* to adjust the white balance of the image.</p>
		*/
		ANDROID_COLOR_CORRECTION_COLOR_TEMPERATURE,
		/**
		* android.colorCorrection.colorTint [dynamic, int32, public]
		*
		* <p>Specifies the color tint for CCT mode to adjust the white
		* balance of the image.</p>
		*/
		ANDROID_COLOR_CORRECTION_COLOR_TINT,
		/**
		* android.colorCorrection.colorTemperatureRange [static, int32[], public]
		*
		* <p>The range of supported color temperature values for
		* ANDROID_COLOR_CORRECTION_COLOR_TEMPERATURE.</p>
		*
		* @see ANDROID_COLOR_CORRECTION_COLOR_TEMPERATURE
		*/
		ANDROID_COLOR_CORRECTION_COLOR_TEMPERATURE_RANGE,
		/**
		* android.colorCorrection.availableModes [static, byte[], public]
		*
		* <p>List of color correction modes for ANDROID_COLOR_CORRECTION_MODE that are
		* supported by this camera device.</p>
		*
		* @see ANDROID_COLOR_CORRECTION_MODE
		*/
		ANDROID_COLOR_CORRECTION_AVAILABLE_MODES,
		/**
		* android.control.aeAntibandingMode [dynamic, enum, public]
		*

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,4 +33,5 @@ enum ColorCorrectionMode {
		ANDROID_COLOR_CORRECTION_MODE_TRANSFORM_MATRIX,
		ANDROID_COLOR_CORRECTION_MODE_FAST,
		ANDROID_COLOR_CORRECTION_MODE_HIGH_QUALITY,
		ANDROID_COLOR_CORRECTION_MODE_CCT,
		}