Snap for 12594757 from afbae946663953364aee54563549a7700dfd2ea2 to 25Q1-release (5f2ec804) · Commits · e / os / android_frameworks_av

camera/camera_platform.aconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -195,3 +195,11 @@ flag {
		bug: "338621560"
		}

		flag {
		namespace: "camera_platform"
		is_exported: true
		name: "color_temperature"
		description: "Add keys to manually set color temperature and color tint"
		bug: "359409044"
		}

camera/ndk/impl/ACameraMetadata.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -536,6 +536,8 @@ ACameraMetadata::isCaptureRequestTag(const uint32_t tag) {
		case ACAMERA_COLOR_CORRECTION_TRANSFORM:
		case ACAMERA_COLOR_CORRECTION_GAINS:
		case ACAMERA_COLOR_CORRECTION_ABERRATION_MODE:
		case ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE:
		case ACAMERA_COLOR_CORRECTION_COLOR_TINT:
		case ACAMERA_CONTROL_AE_ANTIBANDING_MODE:
		case ACAMERA_CONTROL_AE_EXPOSURE_COMPENSATION:
		case ACAMERA_CONTROL_AE_LOCK:

camera/ndk/include/camera/NdkCameraMetadataTags.h

+108 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,100 @@ typedef enum acamera_metadata_tag {
		*/
		ACAMERA_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES = // byte[n]
		ACAMERA_COLOR_CORRECTION_START + 4,
		/**
		* <p>Specifies the color temperature for CCT mode in Kelvin
		* to adjust the white balance of the image.</p>
		*
		* <p>Type: int32</p>
		*
		* <p>This tag may appear in:
		* <ul>
		* <li>ACameraMetadata from ACameraCaptureSession_captureCallback_result callbacks</li>
		* <li>ACaptureRequest</li>
		* </ul></p>
		*
		* <p>Sets the color temperature in Kelvin units for when
		* ACAMERA_COLOR_CORRECTION_MODE is CCT to adjust the
		* white balance of the image.</p>
		* <p>If CCT mode is enabled without a requested color temperature,
		* a default value will be set by the camera device. The default value can be
		* retrieved by checking the corresponding capture result. Color temperatures
		* requested outside the advertised ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE_RANGE
		* will be clamped.</p>
		*
		* @see ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE_RANGE
		* @see ACAMERA_COLOR_CORRECTION_MODE
		*/
		ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE = // int32
		ACAMERA_COLOR_CORRECTION_START + 5,
		/**
		* <p>Specifies the color tint for CCT mode to adjust the white
		* balance of the image.</p>
		*
		* <p>Type: int32</p>
		*
		* <p>This tag may appear in:
		* <ul>
		* <li>ACameraMetadata from ACameraCaptureSession_captureCallback_result callbacks</li>
		* <li>ACaptureRequest</li>
		* </ul></p>
		*
		* <p>Sets the color tint for when ACAMERA_COLOR_CORRECTION_MODE
		* is CCT to adjust the white balance of the image.</p>
		* <p>If CCT mode is enabled without a requested color tint,
		* a default value will be set by the camera device. The default value can be
		* retrieved by checking the corresponding capture result. Color tints requested
		* outside the supported range will be clamped to the nearest limit (-50 or +50).</p>
		*
		* @see ACAMERA_COLOR_CORRECTION_MODE
		*/
		ACAMERA_COLOR_CORRECTION_COLOR_TINT = // int32
		ACAMERA_COLOR_CORRECTION_START + 6,
		/**
		* <p>The range of supported color temperature values for
		* ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE.</p>
		*
		* @see ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE
		*
		* <p>Type: int32[2]</p>
		*
		* <p>This tag may appear in:
		* <ul>
		* <li>ACameraMetadata from ACameraManager_getCameraCharacteristics</li>
		* </ul></p>
		*
		* <p>This key lists the valid range of color temperature values for
		* ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE supported by this camera device.</p>
		* <p>This key will be null on devices that do not support CCT mode for
		* ACAMERA_COLOR_CORRECTION_MODE.</p>
		*
		* @see ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE
		* @see ACAMERA_COLOR_CORRECTION_MODE
		*/
		ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE_RANGE = // int32[2]
		ACAMERA_COLOR_CORRECTION_START + 7,
		/**
		* <p>List of color correction modes for ACAMERA_COLOR_CORRECTION_MODE that are
		* supported by this camera device.</p>
		*
		* @see ACAMERA_COLOR_CORRECTION_MODE
		*
		* <p>Type: byte[n]</p>
		*
		* <p>This tag may appear in:
		* <ul>
		* <li>ACameraMetadata from ACameraManager_getCameraCharacteristics</li>
		* </ul></p>
		*
		* <p>This key lists the valid modes for ACAMERA_COLOR_CORRECTION_MODE. If no
		* color correction modes are available for a device, this key will be null.</p>
		* <p>Camera devices that have a FULL hardware level will always include at least
		* FAST, HIGH_QUALITY, and TRANSFORM_MATRIX modes.</p>
		*
		* @see ACAMERA_COLOR_CORRECTION_MODE
		*/
		ACAMERA_COLOR_CORRECTION_AVAILABLE_MODES = // byte[n]
		ACAMERA_COLOR_CORRECTION_START + 8,
		ACAMERA_COLOR_CORRECTION_END,

		/**
		@@ -8137,6 +8231,20 @@ typedef enum acamera_metadata_enum_acamera_color_correction_mode {
		*/
		ACAMERA_COLOR_CORRECTION_MODE_HIGH_QUALITY = 2,

		/**
		* <p>Use
		* ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE and
		* ACAMERA_COLOR_CORRECTION_COLOR_TINT to adjust the white balance based
		* on correlated color temperature.</p>
		* <p>If AWB is enabled with <code>ACAMERA_CONTROL_AWB_MODE != OFF</code>, then
		* CCT is ignored.</p>
		*
		* @see ACAMERA_COLOR_CORRECTION_COLOR_TEMPERATURE
		* @see ACAMERA_COLOR_CORRECTION_COLOR_TINT
		* @see ACAMERA_CONTROL_AWB_MODE
		*/
		ACAMERA_COLOR_CORRECTION_MODE_CCT = 3,

		} acamera_metadata_enum_android_color_correction_mode_t;

		// ACAMERA_COLOR_CORRECTION_ABERRATION_MODE

media/audio/aconfig/audio_framework.aconfig

+16 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,14 @@ flag {
		bug: "374751406"
		}

		flag {
		name: "deprecate_stream_bt_sco"
		namespace: "media_audio"
		description: "Deprecate STREAM_BLUETOOTH_SCO"
		is_exported: true
		bug: "376756660"
		}

		flag {
		name: "enable_multichannel_group_device"
		namespace: "media_audio"
		@@ -103,6 +111,14 @@ flag {
		bug: "301713440"
		}

		flag {
		name: "hardening_permission_api"
		is_exported: true
		namespace: "media_audio"
		description: "API flag for additional appop/perm constructs for hardening."
		bug: "376480814"
		}

		flag {
		name: "loudness_configurator_api"
		is_exported: true

media/audioaidlconversion/AidlConversionCppNdk.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -480,6 +480,11 @@ const detail::AudioDevicePairs& getAudioDevicePairs() {
		AudioDeviceType::OUT_BROADCAST,
		GET_DEVICE_DESC_CONNECTION(BT_LE))
		},
		{
		AUDIO_DEVICE_OUT_MULTICHANNEL_GROUP, make_AudioDeviceDescription(
		AudioDeviceType::OUT_MULTICHANNEL_GROUP,
		GET_DEVICE_DESC_CONNECTION(VIRTUAL))
		},
		// AUDIO_DEVICE_IN_AMBIENT and IN_COMMUNICATION are removed since they were deprecated.
		{
		AUDIO_DEVICE_IN_BUILTIN_MIC, make_AudioDeviceDescription(
		@@ -1797,8 +1802,6 @@ aidl2legacy_AudioUsage_audio_usage_t(AudioUsage aidl) {
		return AUDIO_USAGE_VEHICLE_STATUS;
		case AudioUsage::ANNOUNCEMENT:
		return AUDIO_USAGE_ANNOUNCEMENT;
		case AudioUsage::SPEAKER_CLEANUP:
		return AUDIO_USAGE_SPEAKER_CLEANUP;
		}
		return unexpected(BAD_VALUE);
		}
		@@ -1850,8 +1853,6 @@ legacy2aidl_audio_usage_t_AudioUsage(audio_usage_t legacy) {
		return AudioUsage::VEHICLE_STATUS;
		case AUDIO_USAGE_ANNOUNCEMENT:
		return AudioUsage::ANNOUNCEMENT;
		case AUDIO_USAGE_SPEAKER_CLEANUP:
		return AudioUsage::SPEAKER_CLEANUP;
		}
		return unexpected(BAD_VALUE);
		}