Merge "hal: Clean up legacy FM TX out device" (729c1d14) · Commits · e / os / android_hardware_qcom_audio

hal/audio_extn/audio_extn.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -60,10 +60,6 @@
		// #define AUDIO_OUTPUT_FLAG_INCALL_MUSIC 0x80000000 //0x8000
		// #endif

		#ifndef AUDIO_DEVICE_OUT_FM_TX
		#define AUDIO_DEVICE_OUT_FM_TX 0x8000000
		#endif

		#ifndef AUDIO_FORMAT_AAC_LATM
		#define AUDIO_FORMAT_AAC_LATM 0x80000000UL
		#define AUDIO_FORMAT_AAC_LATM_LC (AUDIO_FORMAT_AAC_LATM \|\

hal/audio_extn/dolby.c

+1 −4

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

		/* DS1-DDP Endp Params */
		#define DDP_ENDP_NUM_PARAMS 17
		#define DDP_ENDP_NUM_DEVICES 21
		#define DDP_ENDP_NUM_DEVICES 20
		static int ddp_endp_params_id[DDP_ENDP_NUM_PARAMS] = {
		PARAM_ID_MAX_OUTPUT_CHANNELS, PARAM_ID_CTL_RUNNING_MODE,
		PARAM_ID_CTL_ERROR_CONCEAL, PARAM_ID_CTL_ERROR_MAX_RPTS,
		@@ -143,9 +143,6 @@ static struct ddp_endp_params {
		{AUDIO_DEVICE_OUT_FM, 2,
		{8, 0, 0, 0, 0, 0, 0, 21, 1, 6, 0, 0, 0, 0, 0, 0, 0},
		{1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0} },
		{AUDIO_DEVICE_OUT_FM_TX, 2,
		{8, 0, 0, 0, 0, 0, 0, 21, 1, 6, 0, 0, 0, 0, 0, 0, 0},
		{1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0} },
		{AUDIO_DEVICE_OUT_PROXY, 2,
		{8, 0, 0, 0, 0, 0, 0, 21, 1, 2, 0, 0, 0, 0, 0, 0, 0},
		{1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0} },

hal/msm8916/platform.c

+1 −7

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
		* Not a Contribution.
		*
		* Copyright (C) 2013 The Android Open Source Project
		@@ -997,7 +997,6 @@ static int msm_device_to_be_id_internal_codec [][NO_COLS] = {
		{AUDIO_DEVICE_OUT_REMOTE_SUBMIX , 9},
		{AUDIO_DEVICE_OUT_PROXY , 9},
		{AUDIO_DEVICE_OUT_FM , 7},
		{AUDIO_DEVICE_OUT_FM_TX , 8},
		{AUDIO_DEVICE_OUT_ALL , -1},
		{AUDIO_DEVICE_NONE , -1},
		{AUDIO_DEVICE_OUT_DEFAULT , -1},
		@@ -1023,7 +1022,6 @@ static int msm_device_to_be_id_external_codec [][NO_COLS] = {
		{AUDIO_DEVICE_OUT_REMOTE_SUBMIX , 9},
		{AUDIO_DEVICE_OUT_PROXY , 9},
		{AUDIO_DEVICE_OUT_FM , 7},
		{AUDIO_DEVICE_OUT_FM_TX , 8},
		{AUDIO_DEVICE_OUT_ALL , -1},
		{AUDIO_DEVICE_NONE , -1},
		{AUDIO_DEVICE_OUT_DEFAULT , -1},
		@@ -4395,8 +4393,6 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		} else if (devices & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET \|\|
		devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) {
		snd_device = SND_DEVICE_OUT_USB_HEADSET;
		} else if (devices & AUDIO_DEVICE_OUT_FM_TX) {
		snd_device = SND_DEVICE_OUT_TRANSMISSION_FM;
		} else if (devices & AUDIO_DEVICE_OUT_EARPIECE) {
		if (audio_extn_should_use_handset_anc(channel_count))
		snd_device = SND_DEVICE_OUT_ANC_HANDSET;
		@@ -4498,8 +4494,6 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		snd_device = SND_DEVICE_OUT_USB_HEADSET;
		else
		snd_device = SND_DEVICE_OUT_USB_HEADPHONES;
		} else if (devices & AUDIO_DEVICE_OUT_FM_TX) {
		snd_device = SND_DEVICE_OUT_TRANSMISSION_FM;
		} else if (devices & AUDIO_DEVICE_OUT_EARPIECE) {
		if (use_voip_out_devices)
		snd_device = SND_DEVICE_OUT_VOIP_HANDSET;

hal/msm8974/platform.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -1358,7 +1358,6 @@ static int msm_device_to_be_id [][NO_COLS] = {
		{AUDIO_DEVICE_OUT_REMOTE_SUBMIX , 9},
		{AUDIO_DEVICE_OUT_PROXY , 9},
		{AUDIO_DEVICE_OUT_FM , 7},
		{AUDIO_DEVICE_OUT_FM_TX , 8},
		{AUDIO_DEVICE_OUT_ALL , -1},
		{AUDIO_DEVICE_NONE , -1},
		{AUDIO_DEVICE_OUT_DEFAULT , -1},
		@@ -1385,7 +1384,6 @@ static int msm_device_to_be_id [][NO_COLS] = {
		{AUDIO_DEVICE_OUT_PROXY , 9},
		/* Add the correct be ids */
		{AUDIO_DEVICE_OUT_FM , 7},
		{AUDIO_DEVICE_OUT_FM_TX , 8},
		{AUDIO_DEVICE_OUT_ALL , -1},
		{AUDIO_DEVICE_NONE , -1},
		{AUDIO_DEVICE_OUT_DEFAULT , -1},
		@@ -1412,7 +1410,6 @@ static int msm_device_to_be_id [][NO_COLS] = {
		{AUDIO_DEVICE_OUT_PROXY , 9},
		/* Add the correct be ids */
		{AUDIO_DEVICE_OUT_FM , 7},
		{AUDIO_DEVICE_OUT_FM_TX , 8},
		{AUDIO_DEVICE_OUT_ALL , -1},
		{AUDIO_DEVICE_NONE , -1},
		{AUDIO_DEVICE_OUT_DEFAULT , -1},
		@@ -1439,7 +1436,6 @@ static int msm_device_to_be_id [][NO_COLS] = {
		{AUDIO_DEVICE_OUT_PROXY , 9},
		/* Add the correct be ids */
		{AUDIO_DEVICE_OUT_FM , 7},
		{AUDIO_DEVICE_OUT_FM_TX , 8},
		{AUDIO_DEVICE_OUT_ALL , -1},
		{AUDIO_DEVICE_NONE , -1},
		{AUDIO_DEVICE_OUT_DEFAULT , -1},
		@@ -1473,7 +1469,6 @@ static int msm_device_to_be_id_internal_codec [][NO_COLS] = {
		{AUDIO_DEVICE_OUT_REMOTE_SUBMIX , 9},
		{AUDIO_DEVICE_OUT_PROXY , 9},
		{AUDIO_DEVICE_OUT_FM , 7},
		{AUDIO_DEVICE_OUT_FM_TX , 8},
		{AUDIO_DEVICE_OUT_ALL , -1},
		{AUDIO_DEVICE_NONE , -1},
		{AUDIO_DEVICE_OUT_DEFAULT , -1},
		@@ -1499,7 +1494,6 @@ static int msm_device_to_be_id_external_codec [][NO_COLS] = {
		{AUDIO_DEVICE_OUT_REMOTE_SUBMIX , 9},
		{AUDIO_DEVICE_OUT_PROXY , 9},
		{AUDIO_DEVICE_OUT_FM , 7},
		{AUDIO_DEVICE_OUT_FM_TX , 8},
		{AUDIO_DEVICE_OUT_ALL , -1},
		{AUDIO_DEVICE_NONE , -1},
		{AUDIO_DEVICE_OUT_DEFAULT , -1},
		@@ -6240,8 +6234,6 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		my_data->ext_disp[controller][stream].type);
		goto exit;
		}
		} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_FM_TX)) {
		snd_device = SND_DEVICE_OUT_TRANSMISSION_FM;
		} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_EARPIECE)) {
		if(adev->voice.hac)
		snd_device = SND_DEVICE_OUT_VOICE_HAC_HANDSET;
		@@ -6356,8 +6348,6 @@ snd_device_t platform_get_output_snd_device(void platform, struct stream_out o
		snd_device = SND_DEVICE_OUT_USB_HEADSET;
		else
		snd_device = SND_DEVICE_OUT_USB_HEADPHONES;
		} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_FM_TX)) {
		snd_device = SND_DEVICE_OUT_TRANSMISSION_FM;
		} else if (compare_device_type(&devices, AUDIO_DEVICE_OUT_EARPIECE)) {
		/HAC support for voice-ish audio (eg visual voicemail)/
		if(adev->voice.hac)