Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 377ebebf authored Jan 16, 2023 by Atneya Nair Committed by Automerger Merge Worker Jan 16, 2023

Rename AudioPortConfig to AudioPortConfigFw am: b8de69bc am: 8a5eb843

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2388396

Change-Id: I0b032cde0ceffd7455b29a6fb66f3543d98df9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 93b99d02 8a5eb843

media/libaudioclient/AidlConversion.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -417,7 +417,7 @@ status_t legacy2aidl_AudioPortExt(
	}		}

	ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_config(		ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_config(
	const media::AudioPortConfig& aidl) {		const media::AudioPortConfigFw& aidl) {
	audio_port_config legacy{};		audio_port_config legacy{};
	legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.hal.id));		legacy.id = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.hal.id));
	legacy.role = VALUE_OR_RETURN(aidl2legacy_AudioPortRole_audio_port_role_t(aidl.sys.role));		legacy.role = VALUE_OR_RETURN(aidl2legacy_AudioPortRole_audio_port_role_t(aidl.sys.role));
	@@ -457,9 +457,9 @@ ConversionResult<audio_port_config> aidl2legacy_AudioPortConfig_audio_port_confi
	return legacy;		return legacy;
	}		}

	ConversionResult<media::AudioPortConfig> legacy2aidl_audio_port_config_AudioPortConfig(		ConversionResult<media::AudioPortConfigFw> legacy2aidl_audio_port_config_AudioPortConfig(
	const audio_port_config& legacy) {		const audio_port_config& legacy) {
	media::AudioPortConfig aidl;		media::AudioPortConfigFw aidl;
	aidl.hal.id = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.id));		aidl.hal.id = VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.id));
	aidl.sys.role = VALUE_OR_RETURN(legacy2aidl_audio_port_role_t_AudioPortRole(legacy.role));		aidl.sys.role = VALUE_OR_RETURN(legacy2aidl_audio_port_role_t_AudioPortRole(legacy.role));
	aidl.sys.type = VALUE_OR_RETURN(legacy2aidl_audio_port_type_t_AudioPortType(legacy.type));		aidl.sys.type = VALUE_OR_RETURN(legacy2aidl_audio_port_type_t_AudioPortType(legacy.type));

media/libaudioclient/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -290,7 +290,7 @@ aidl_interface {
	"aidl/android/media/AudioPatch.aidl",		"aidl/android/media/AudioPatch.aidl",
	"aidl/android/media/AudioPort.aidl",		"aidl/android/media/AudioPort.aidl",
	"aidl/android/media/AudioPortSys.aidl",		"aidl/android/media/AudioPortSys.aidl",
	"aidl/android/media/AudioPortConfig.aidl",		"aidl/android/media/AudioPortConfigFw.aidl",
	"aidl/android/media/AudioPortConfigSys.aidl",		"aidl/android/media/AudioPortConfigSys.aidl",
	"aidl/android/media/AudioPortDeviceExtSys.aidl",		"aidl/android/media/AudioPortDeviceExtSys.aidl",
	"aidl/android/media/AudioPortExtSys.aidl",		"aidl/android/media/AudioPortExtSys.aidl",

media/libaudioclient/AudioSystem.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1618,7 +1618,7 @@ status_t AudioSystem::setAudioPortConfig(const struct audio_port_config* config)
	const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
	if (aps == 0) return PERMISSION_DENIED;		if (aps == 0) return PERMISSION_DENIED;

	media::AudioPortConfig configAidl = VALUE_OR_RETURN_STATUS(		media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(
	legacy2aidl_audio_port_config_AudioPortConfig(*config));		legacy2aidl_audio_port_config_AudioPortConfig(*config));
	return statusTFromBinderStatus(aps->setAudioPortConfig(configAidl));		return statusTFromBinderStatus(aps->setAudioPortConfig(configAidl));
	}		}
	@@ -1839,7 +1839,7 @@ status_t AudioSystem::startAudioSource(const struct audio_port_config* source,
	const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();		const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
	if (aps == 0) return PERMISSION_DENIED;		if (aps == 0) return PERMISSION_DENIED;

	media::AudioPortConfig sourceAidl = VALUE_OR_RETURN_STATUS(		media::AudioPortConfigFw sourceAidl = VALUE_OR_RETURN_STATUS(
	legacy2aidl_audio_port_config_AudioPortConfig(*source));		legacy2aidl_audio_port_config_AudioPortConfig(*source));
	media::AudioAttributesInternal attributesAidl = VALUE_OR_RETURN_STATUS(		media::AudioAttributesInternal attributesAidl = VALUE_OR_RETURN_STATUS(
	legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attributes));		legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attributes));

media/libaudioclient/IAudioFlinger.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -707,7 +707,7 @@ status_t AudioFlingerClientAdapter::listAudioPatches(unsigned int* num_patches,
	}		}

	status_t AudioFlingerClientAdapter::setAudioPortConfig(const struct audio_port_config* config) {		status_t AudioFlingerClientAdapter::setAudioPortConfig(const struct audio_port_config* config) {
	media::AudioPortConfig configAidl = VALUE_OR_RETURN_STATUS(		media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(
	legacy2aidl_audio_port_config_AudioPortConfig(*config));		legacy2aidl_audio_port_config_AudioPortConfig(*config));
	return statusTFromBinderStatus(mDelegate->setAudioPortConfig(configAidl));		return statusTFromBinderStatus(mDelegate->setAudioPortConfig(configAidl));
	}		}
	@@ -1274,7 +1274,7 @@ Status AudioFlingerServerAdapter::listAudioPatches(int32_t maxCount,
	return Status::ok();		return Status::ok();
	}		}

	Status AudioFlingerServerAdapter::setAudioPortConfig(const media::AudioPortConfig& config) {		Status AudioFlingerServerAdapter::setAudioPortConfig(const media::AudioPortConfigFw& config) {
	audio_port_config configLegacy = VALUE_OR_RETURN_BINDER(		audio_port_config configLegacy = VALUE_OR_RETURN_BINDER(
	aidl2legacy_AudioPortConfig_audio_port_config(config));		aidl2legacy_AudioPortConfig_audio_port_config(config));
	return Status::fromStatusT(mDelegate->setAudioPortConfig(&configLegacy));		return Status::fromStatusT(mDelegate->setAudioPortConfig(&configLegacy));

media/libaudioclient/aidl/android/media/AudioPatch.aidl

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	package android.media;		package android.media;

	import android.media.AudioPortConfig;		import android.media.AudioPortConfigFw;

	/**		/**
	* {@hide}		* {@hide}
	@@ -27,6 +27,6 @@ parcelable AudioPatch {
	* Interpreted as audio_patch_handle_t.		* Interpreted as audio_patch_handle_t.
	*/		*/
	int id;		int id;
	AudioPortConfig[] sources;		AudioPortConfigFw[] sources;
	AudioPortConfig[] sinks;		AudioPortConfigFw[] sinks;
	}		}