am cefbbac4: hal: update EC reference handling (40ac9b6c) · Commits · e / devices / samsung / android_hardware_qcom_audio

hal/audio_hw.c

+18 −2

Original line number	Diff line number	Diff line
		@@ -1731,6 +1731,8 @@ static int in_standby(struct audio_stream *stream)
		pcm_close(in->pcm);
		in->pcm = NULL;
		}
		adev->enable_voicerx = false;
		platform_set_echo_reference(adev, false, AUDIO_DEVICE_NONE );
		status = stop_input_stream(in);
		pthread_mutex_unlock(&adev->lock);
		}
		@@ -1855,6 +1857,7 @@ static int add_remove_audio_effect(const struct audio_stream *stream,
		bool enable)
		{
		struct stream_in in = (struct stream_in )stream;
		struct audio_device *adev = in->dev;
		int status = 0;
		effect_descriptor_t desc;

		@@ -1868,6 +1871,18 @@ static int add_remove_audio_effect(const struct audio_stream *stream,
		in->enable_aec != enable &&
		(memcmp(&desc.type, FX_IID_AEC, sizeof(effect_uuid_t)) == 0)) {
		in->enable_aec = enable;
		if (!enable)
		platform_set_echo_reference(in->dev, enable, AUDIO_DEVICE_NONE);
		adev->enable_voicerx = enable;
		struct audio_usecase *usecase;
		struct listnode *node;
		list_for_each(node, &adev->usecase_list) {
		usecase = node_to_item(node, struct audio_usecase, list);
		if (usecase->type == PCM_PLAYBACK) {
		select_devices(adev, usecase->id);
		break;
		}
		}
		if (!in->standby)
		select_devices(in->dev, in->usecase);
		}
		@@ -2337,7 +2352,7 @@ static int adev_open_input_stream(struct audio_hw_device *dev,
		struct audio_stream_in **stream_in,
		audio_input_flags_t flags,
		const char *address __unused,
		audio_source_t source __unused)
		audio_source_t source )
		{
		struct audio_device adev = (struct audio_device )dev;
		struct stream_in *in;
		@@ -2371,7 +2386,7 @@ static int adev_open_input_stream(struct audio_hw_device *dev,
		in->stream.get_input_frames_lost = in_get_input_frames_lost;

		in->device = devices;
		in->source = AUDIO_SOURCE_DEFAULT;
		in->source = source;
		in->dev = adev;
		in->standby = 1;
		in->channel_mask = config->channel_mask;
		@@ -2704,6 +2719,7 @@ static int adev_open(const hw_module_t module, const char name,
		}

		adev->bt_wb_speech_enabled = false;
		adev->enable_voicerx = false;

		*device = &adev->device.common;
		if (k_enable_extended_precision)

hal/audio_hw.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -212,6 +212,7 @@ struct audio_device {
		unsigned int cur_hdmi_channels;
		bool bt_wb_speech_enabled;
		bool mic_muted;
		bool enable_voicerx;

		int snd_card;
		void *platform;

hal/msm8960/platform.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1002,3 +1002,8 @@ int platform_set_snd_device_backend(snd_device_t device __unused,
		{
		return -ENOSYS;
		}

		void platform_set_echo_reference(struct audio_device *adev, bool enable, audio_devices_t out_device)
		{
		return;
		}

hal/msm8974/platform.c

+33 −16

Original line number	Diff line number	Diff line
		@@ -172,6 +172,7 @@ static const char * const device_table[SND_DEVICE_MAX] = {
		[SND_DEVICE_IN_SPEAKER_DMIC_STEREO] = "speaker-dmic-endfire",

		[SND_DEVICE_IN_HEADSET_MIC] = "headset-mic",
		[SND_DEVICE_IN_HEADSET_MIC_AEC] = "headset-mic",

		[SND_DEVICE_IN_HDMI_MIC] = "hdmi-mic",
		[SND_DEVICE_IN_BT_SCO_MIC] = "bt-sco-mic",
		@@ -243,6 +244,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = {
		[SND_DEVICE_IN_SPEAKER_DMIC_STEREO] = 35,

		[SND_DEVICE_IN_HEADSET_MIC] = 8,
		[SND_DEVICE_IN_HEADSET_MIC_AEC] = ACDB_ID_HEADSET_MIC_AEC,

		[SND_DEVICE_IN_HDMI_MIC] = 4,
		[SND_DEVICE_IN_BT_SCO_MIC] = 21,
		@@ -405,14 +407,25 @@ bool is_operator_tmus()
		return is_tmus;
		}

		static void set_echo_reference(struct audio_device *adev, bool enable)
		void platform_set_echo_reference(struct audio_device *adev, bool enable, audio_devices_t out_device)
		{
		char mixer_path[50] = { 0 } ;
		snd_device_t snd_device = SND_DEVICE_NONE;
		struct listnode *node;
		struct audio_usecase *usecase;

		strcpy(mixer_path, "echo-reference");
		if (out_device != AUDIO_DEVICE_NONE) {
		snd_device = platform_get_output_snd_device(adev->platform, out_device);
		platform_add_backend_name(adev->platform, mixer_path, snd_device);
		}

		if (enable)
		audio_route_apply_and_update_path(adev->audio_route, "echo-reference");
		audio_route_apply_and_update_path(adev->audio_route, mixer_path);
		else
		audio_route_reset_and_update_path(adev->audio_route, "echo-reference");
		audio_route_reset_and_update_path(adev->audio_route, mixer_path);

		ALOGV("Setting EC Reference: %d", enable);
		ALOGV("Setting EC Reference: %d for %s", enable, mixer_path);
		}

		static struct csd_data *open_csd_client(bool i2s_ext_modem)
		@@ -1173,15 +1186,19 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi
		goto exit;
		}

		if (mode == AUDIO_MODE_IN_CALL) {
		if ((mode == AUDIO_MODE_IN_CALL) \|\|
		(adev->enable_voicerx)) {
		if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|\|
		devices & AUDIO_DEVICE_OUT_WIRED_HEADSET \|\|
		devices & AUDIO_DEVICE_OUT_LINE) {
		if (adev->voice.tty_mode == TTY_MODE_FULL)
		if ((mode == AUDIO_MODE_IN_CALL) &&
		(adev->voice.tty_mode == TTY_MODE_FULL))
		snd_device = SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES;
		else if (adev->voice.tty_mode == TTY_MODE_VCO)
		else if ((mode == AUDIO_MODE_IN_CALL) &&
		(adev->voice.tty_mode == TTY_MODE_VCO))
		snd_device = SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES;
		else if (adev->voice.tty_mode == TTY_MODE_HCO)
		else if ((mode == AUDIO_MODE_IN_CALL) &&
		(adev->voice.tty_mode == TTY_MODE_HCO))
		snd_device = SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET;
		else {
		if (devices & AUDIO_DEVICE_OUT_LINE)
		@@ -1319,7 +1336,6 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
		if (out_device & AUDIO_DEVICE_OUT_EARPIECE) {
		if (my_data->fluence_in_voice_call == false) {
		snd_device = SND_DEVICE_IN_HANDSET_MIC;
		set_echo_reference(adev, true);
		} else {
		if (is_operator_tmus())
		snd_device = SND_DEVICE_IN_VOICE_DMIC_TMUS;
		@@ -1343,7 +1359,6 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
		snd_device = SND_DEVICE_IN_VOICE_SPEAKER_DMIC;
		} else {
		snd_device = SND_DEVICE_IN_VOICE_SPEAKER_MIC;
		set_echo_reference(adev, true);
		}
		} else if (out_device & AUDIO_DEVICE_OUT_TELEPHONY_TX)
		snd_device = SND_DEVICE_IN_VOICE_RX;
		@@ -1388,8 +1403,10 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
		snd_device = SND_DEVICE_IN_HANDSET_DMIC_AEC_NS;
		} else
		snd_device = SND_DEVICE_IN_HANDSET_MIC_AEC_NS;
		} else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {
		snd_device = SND_DEVICE_IN_HEADSET_MIC_AEC;
		}
		set_echo_reference(adev, true);
		platform_set_echo_reference(adev, true, out_device);
		} else if (adev->active_input->enable_aec) {
		if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
		if (my_data->fluence_in_spkr_mode &&
		@@ -1404,8 +1421,10 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
		snd_device = SND_DEVICE_IN_HANDSET_DMIC_AEC;
		} else
		snd_device = SND_DEVICE_IN_HANDSET_MIC_AEC;
		} else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {
		snd_device = SND_DEVICE_IN_HEADSET_MIC_AEC;
		}
		set_echo_reference(adev, true);
		platform_set_echo_reference(adev, true, out_device);
		} else if (adev->active_input->enable_ns) {
		if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
		if (my_data->fluence_in_spkr_mode &&
		@@ -1421,9 +1440,7 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
		} else
		snd_device = SND_DEVICE_IN_HANDSET_MIC_NS;
		}
		set_echo_reference(adev, false);
		} else
		set_echo_reference(adev, false);
		}
		}
		} else if (source == AUDIO_SOURCE_DEFAULT) {
		goto exit;

hal/msm8974/platform.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ enum {
		SND_DEVICE_IN_SPEAKER_DMIC_STEREO,

		SND_DEVICE_IN_HEADSET_MIC,
		SND_DEVICE_IN_HEADSET_MIC_AEC,

		SND_DEVICE_IN_HDMI_MIC,
		SND_DEVICE_IN_BT_SCO_MIC,
		@@ -128,11 +129,13 @@ enum {
		#define ACDB_ID_VOICE_HANDSET 67
		#define ACDB_ID_VOICE_HANDSET_TMUS 67
		#define ACDB_ID_VOICE_DMIC_EF_TMUS 89
		#define ACDB_ID_HEADSET_MIC_AEC 47
		#else
		#define ACDB_ID_VOICE_SPEAKER 15
		#define ACDB_ID_VOICE_HANDSET 7
		#define ACDB_ID_VOICE_HANDSET_TMUS 88
		#define ACDB_ID_VOICE_DMIC_EF_TMUS 89
		#define ACDB_ID_HEADSET_MIC_AEC 10
		#endif

		#define MAX_VOL_INDEX 5