Merge "hal: Add support for LINE out device" (6c6171bd) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

hal/msm8974/platform.c

+24 −4

Original line number	Diff line number	Diff line
		@@ -333,13 +333,16 @@ static const char * const device_table[SND_DEVICE_MAX] = {
		[SND_DEVICE_OUT_SPEAKER_REVERSE] = "speaker-reverse",
		[SND_DEVICE_OUT_HEADPHONES] = "headphones",
		[SND_DEVICE_OUT_HEADPHONES_44_1] = "headphones-44.1",
		[SND_DEVICE_OUT_LINE] = "line",
		[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = "speaker-and-headphones",
		[SND_DEVICE_OUT_SPEAKER_AND_LINE] = "speaker-and-line",
		[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = "speaker-and-headphones-ext-1",
		[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = "speaker-and-headphones-ext-2",
		[SND_DEVICE_OUT_VOICE_HANDSET] = "voice-handset",
		[SND_DEVICE_OUT_VOICE_SPEAKER] = "voice-speaker",
		[SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = "voice-speaker-vbat",
		[SND_DEVICE_OUT_VOICE_HEADPHONES] = "voice-headphones",
		[SND_DEVICE_OUT_VOICE_LINE] = "voice-line",
		[SND_DEVICE_OUT_HDMI] = "hdmi",
		[SND_DEVICE_OUT_SPEAKER_AND_HDMI] = "speaker-and-hdmi",
		[SND_DEVICE_OUT_BT_SCO] = "bt-sco-headset",
		@@ -433,15 +436,18 @@ static int acdb_device_table[SND_DEVICE_MAX] = {
		[SND_DEVICE_OUT_SPEAKER_EXTERNAL_2] = 130,
		[SND_DEVICE_OUT_SPEAKER_VBAT] = 14,
		[SND_DEVICE_OUT_SPEAKER_REVERSE] = 14,
		[SND_DEVICE_OUT_LINE] = 10,
		[SND_DEVICE_OUT_HEADPHONES] = 10,
		[SND_DEVICE_OUT_HEADPHONES_44_1] = 10,
		[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES] = 10,
		[SND_DEVICE_OUT_SPEAKER_AND_LINE] = 10,
		[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1] = 130,
		[SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2] = 130,
		[SND_DEVICE_OUT_VOICE_HANDSET] = 7,
		[SND_DEVICE_OUT_VOICE_SPEAKER] = 14,
		[SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = 14,
		[SND_DEVICE_OUT_VOICE_HEADPHONES] = 10,
		[SND_DEVICE_OUT_VOICE_LINE] = 10,
		[SND_DEVICE_OUT_HDMI] = 18,
		[SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 14,
		[SND_DEVICE_OUT_BT_SCO] = 22,
		@@ -539,13 +545,16 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = {
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_REVERSE)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_HEADPHONES)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_HEADPHONES_44_1)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_LINE)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_LINE)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HANDSET)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_VBAT)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_LINE)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HDMI)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_BT_SCO)},
		@@ -2299,6 +2308,9 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2;
		else
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;
		} else if (devices == (AUDIO_DEVICE_OUT_LINE \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_LINE;
		} else if (devices == (AUDIO_DEVICE_OUT_AUX_DIGITAL \|
		AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_HDMI;
		@@ -2322,7 +2334,8 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		if ((mode == AUDIO_MODE_IN_CALL) \|\|
		voice_extn_compress_voip_is_active(adev)) {
		if (devices & AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|\|
		devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
		devices & AUDIO_DEVICE_OUT_WIRED_HEADSET \|\|
		devices & AUDIO_DEVICE_OUT_LINE) {
		if ((adev->voice.tty_mode != TTY_MODE_OFF) &&
		!voice_extn_compress_voip_is_active(adev)) {
		switch (adev->voice.tty_mode) {
		@@ -2339,6 +2352,8 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		ALOGE("%s: Invalid TTY mode (%#x)",
		__func__, adev->voice.tty_mode);
		}
		} else if (devices & AUDIO_DEVICE_OUT_LINE) {
		snd_device = SND_DEVICE_OUT_VOICE_LINE;
		} else if (audio_extn_get_anc_enabled()) {
		if (audio_extn_should_use_fb_anc())
		snd_device = SND_DEVICE_OUT_VOICE_ANC_FB_HEADSET;
		@@ -2388,6 +2403,8 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		snd_device = SND_DEVICE_OUT_HEADPHONES_44_1;
		else
		snd_device = SND_DEVICE_OUT_HEADPHONES;
		} else if (devices & AUDIO_DEVICE_OUT_LINE) {
		snd_device = SND_DEVICE_OUT_LINE;
		} else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {
		if (my_data->external_spk_1)
		snd_device = SND_DEVICE_OUT_SPEAKER_EXTERNAL_1;
		@@ -2467,7 +2484,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
		if ((adev->voice.tty_mode != TTY_MODE_OFF) &&
		!voice_extn_compress_voip_is_active(adev)) {
		if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|\|
		out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
		out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET \|\|
		out_device & AUDIO_DEVICE_OUT_LINE) {
		switch (adev->voice.tty_mode) {
		case TTY_MODE_FULL:
		snd_device = SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC;
		@@ -2485,7 +2503,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
		}
		}
		if (out_device & AUDIO_DEVICE_OUT_EARPIECE \|\|
		out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {
		out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|\|
		out_device & AUDIO_DEVICE_OUT_LINE) {
		if (out_device & AUDIO_DEVICE_OUT_EARPIECE &&
		audio_extn_should_use_handset_anc(channel_count)) {
		snd_device = SND_DEVICE_IN_AANC_HANDSET_MIC;
		@@ -2701,7 +2720,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d
		snd_device = SND_DEVICE_IN_SPEAKER_STEREO_DMIC;
		else
		snd_device = SND_DEVICE_IN_SPEAKER_MIC;
		} else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {
		} else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE \|\|
		out_device & AUDIO_DEVICE_OUT_LINE) {
		snd_device = SND_DEVICE_IN_HANDSET_MIC;
		} else if (out_device & AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET) {
		if (adev->bt_wb_speech_enabled) {

hal/msm8974/platform.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,8 @@ enum {
		*/
		#define AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND \
		(AUDIO_DEVICE_OUT_EARPIECE \| AUDIO_DEVICE_OUT_SPEAKER \| \
		AUDIO_DEVICE_OUT_WIRED_HEADSET \| AUDIO_DEVICE_OUT_WIRED_HEADPHONE)
		AUDIO_DEVICE_OUT_WIRED_HEADSET \| AUDIO_DEVICE_OUT_WIRED_HEADPHONE \| \
		AUDIO_DEVICE_OUT_LINE)

		/*
		* Below are the input devices for which back end is same, SLIMBUS_0_TX.
		@@ -70,15 +71,18 @@ enum {
		SND_DEVICE_OUT_SPEAKER_EXTERNAL_2,
		SND_DEVICE_OUT_SPEAKER_REVERSE,
		SND_DEVICE_OUT_SPEAKER_VBAT,
		SND_DEVICE_OUT_LINE,
		SND_DEVICE_OUT_HEADPHONES,
		SND_DEVICE_OUT_HEADPHONES_44_1,
		SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES,
		SND_DEVICE_OUT_SPEAKER_AND_LINE,
		SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_1,
		SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2,
		SND_DEVICE_OUT_VOICE_HANDSET,
		SND_DEVICE_OUT_VOICE_SPEAKER,
		SND_DEVICE_OUT_VOICE_SPEAKER_VBAT,
		SND_DEVICE_OUT_VOICE_HEADPHONES,
		SND_DEVICE_OUT_VOICE_LINE,
		SND_DEVICE_OUT_HDMI,
		SND_DEVICE_OUT_SPEAKER_AND_HDMI,
		SND_DEVICE_OUT_BT_SCO,