audio HAL: add support for BT_sco and speaker combo device. (be6a8445) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

hal/msm8916/platform.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -434,6 +434,8 @@ static const char * const device_table[SND_DEVICE_MAX] = {
		[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = "voice-speaker-2-protected-vbat",
		[SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS] = "speaker-protected",
		[SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS] = "speaker-protected-vbat",
		[SND_DEVICE_OUT_SPEAKER_AND_BT_SCO] = "speaker-and-bt-sco",
		[SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB] = "speaker-and-bt-sco-wb",
		#ifdef RECORD_PLAY_CONCURRENCY
		[SND_DEVICE_OUT_VOIP_HANDSET] = "voip-handset",
		[SND_DEVICE_OUT_VOIP_SPEAKER] = "voip-speaker",
		@@ -698,6 +700,8 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = {
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_BT_SCO)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TX)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_AFE_PROXY)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_USB_HEADSET)},
		@@ -3564,6 +3568,18 @@ int platform_split_snd_device(void *platform,
		new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
		new_snd_devices[1] = SND_DEVICE_OUT_USB_HEADSET;
		ret = 0;
		} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_BT_SCO &&
		!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO)) {
		*num_devices = 2;
		new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
		new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO;
		ret = 0;
		} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB &&
		!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO_WB)) {
		*num_devices = 2;
		new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
		new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_WB;
		ret = 0;
		} else if (SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP == snd_device) {
		*num_devices = 2;
		new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
		@@ -3711,6 +3727,11 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		} else if ((devices & AUDIO_DEVICE_OUT_SPEAKER) &&
		(devices & AUDIO_DEVICE_OUT_ALL_A2DP)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP;
		} else if ((devices & AUDIO_DEVICE_OUT_ALL_SCO) &&
		((devices & ~AUDIO_DEVICE_OUT_ALL_SCO) == AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = adev->bt_wb_speech_enabled ?
		SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB :
		SND_DEVICE_OUT_SPEAKER_AND_BT_SCO;
		} else {
		ALOGE("%s: Invalid combo device(%#x)", __func__, devices);
		goto exit;

hal/msm8916/platform.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,8 @@ enum {
		SND_DEVICE_OUT_BT_SCO_WB,
		SND_DEVICE_OUT_BT_A2DP,
		SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP,
		SND_DEVICE_OUT_SPEAKER_AND_BT_SCO,
		SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB,
		SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES,
		SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,
		SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,

hal/msm8974/platform.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -415,6 +415,8 @@ static const char * const device_table[SND_DEVICE_MAX] = {
		[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = "voice-speaker-2-protected-vbat",
		[SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS] = "speaker-protected",
		[SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS] = "speaker-protected-vbat",
		[SND_DEVICE_OUT_SPEAKER_AND_BT_SCO] = "speaker-and-bt-sco",
		[SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB] = "speaker-and-bt-sco-wb",

		/* Capture sound devices */
		[SND_DEVICE_IN_HANDSET_MIC] = "handset-mic",
		@@ -674,6 +676,8 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = {
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_BT_SCO)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_FULL_USB)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TTY_VCO_USB)},
		{TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_TX)},
		@@ -3336,6 +3340,18 @@ int platform_split_snd_device(void *platform,
		new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
		new_snd_devices[1] = SND_DEVICE_OUT_USB_HEADSET;
		ret = 0;
		} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_BT_SCO &&
		!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO)) {
		*num_devices = 2;
		new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
		new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO;
		ret = 0;
		} else if (snd_device == SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB &&
		!platform_check_backends_match(SND_DEVICE_OUT_SPEAKER, SND_DEVICE_OUT_BT_SCO_WB)) {
		*num_devices = 2;
		new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
		new_snd_devices[1] = SND_DEVICE_OUT_BT_SCO_WB;
		ret = 0;
		} else if (SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP == snd_device) {
		*num_devices = 2;
		new_snd_devices[0] = SND_DEVICE_OUT_SPEAKER;
		@@ -3479,6 +3495,11 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		} else if ((devices & AUDIO_DEVICE_OUT_SPEAKER) &&
		(devices & AUDIO_DEVICE_OUT_ALL_A2DP)) {
		snd_device = SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP;
		} else if ((devices & AUDIO_DEVICE_OUT_ALL_SCO) &&
		((devices & ~AUDIO_DEVICE_OUT_ALL_SCO) == AUDIO_DEVICE_OUT_SPEAKER)) {
		snd_device = adev->bt_wb_speech_enabled ?
		SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB :
		SND_DEVICE_OUT_SPEAKER_AND_BT_SCO;
		} else {
		ALOGE("%s: Invalid combo device(%#x)", __func__, devices);
		goto exit;

hal/msm8974/platform.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,8 @@ enum {
		SND_DEVICE_OUT_BT_SCO_WB,
		SND_DEVICE_OUT_BT_A2DP,
		SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP,
		SND_DEVICE_OUT_SPEAKER_AND_BT_SCO,
		SND_DEVICE_OUT_SPEAKER_AND_BT_SCO_WB,
		SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES,
		SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES,
		SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET,