Merge "hal: update snd device selection in auto hal" (27495b4a) · Commits · e / os / android_hardware_qcom_audio

hal/audio_extn/audio_extn.c

+36 −18

Original line number	Original line	Diff line number	Diff line
	@@ -5467,10 +5467,6 @@ static auto_hal_open_output_stream_t auto_hal_open_output_stream;
	typedef bool (*auto_hal_is_bus_device_usecase_t)(audio_usecase_t);		typedef bool (*auto_hal_is_bus_device_usecase_t)(audio_usecase_t);
	static auto_hal_is_bus_device_usecase_t auto_hal_is_bus_device_usecase;		static auto_hal_is_bus_device_usecase_t auto_hal_is_bus_device_usecase;

	typedef snd_device_t (*auto_hal_get_snd_device_for_car_audio_stream_t)(
	struct stream_out*);
	static auto_hal_get_snd_device_for_car_audio_stream_t auto_hal_get_snd_device_for_car_audio_stream;

	typedef int (auto_hal_get_audio_port_t)(struct audio_hw_device,		typedef int (auto_hal_get_audio_port_t)(struct audio_hw_device,
	struct audio_port*);		struct audio_port*);
	static auto_hal_get_audio_port_t auto_hal_get_audio_port;		static auto_hal_get_audio_port_t auto_hal_get_audio_port;
	@@ -5491,6 +5487,14 @@ typedef int (auto_hal_stop_hfp_downlink_t)(struct audio_device,
	struct audio_usecase*);		struct audio_usecase*);
	static auto_hal_stop_hfp_downlink_t auto_hal_stop_hfp_downlink;		static auto_hal_stop_hfp_downlink_t auto_hal_stop_hfp_downlink;

			typedef snd_device_t (auto_hal_get_input_snd_device_t)(struct audio_device,
			audio_usecase_t);
			static auto_hal_get_input_snd_device_t auto_hal_get_input_snd_device;

			typedef snd_device_t (auto_hal_get_output_snd_device_t)(struct audio_device,
			audio_usecase_t);
			static auto_hal_get_output_snd_device_t auto_hal_get_output_snd_device;

	int auto_hal_feature_init(bool is_feature_enabled)		int auto_hal_feature_init(bool is_feature_enabled)
	{		{
	ALOGD("%s: Called with feature %s", __func__,		ALOGD("%s: Called with feature %s", __func__,
	@@ -5523,9 +5527,6 @@ int auto_hal_feature_init(bool is_feature_enabled)
	!(auto_hal_is_bus_device_usecase =		!(auto_hal_is_bus_device_usecase =
	(auto_hal_is_bus_device_usecase_t)dlsym(		(auto_hal_is_bus_device_usecase_t)dlsym(
	auto_hal_lib_handle, "auto_hal_is_bus_device_usecase")) \|\|		auto_hal_lib_handle, "auto_hal_is_bus_device_usecase")) \|\|
	!(auto_hal_get_snd_device_for_car_audio_stream =
	(auto_hal_get_snd_device_for_car_audio_stream_t)dlsym(
	auto_hal_lib_handle, "auto_hal_get_snd_device_for_car_audio_stream")) \|\|
	!(auto_hal_get_audio_port =		!(auto_hal_get_audio_port =
	(auto_hal_get_audio_port_t)dlsym(		(auto_hal_get_audio_port_t)dlsym(
	auto_hal_lib_handle, "auto_hal_get_audio_port")) \|\|		auto_hal_lib_handle, "auto_hal_get_audio_port")) \|\|
	@@ -5540,7 +5541,13 @@ int auto_hal_feature_init(bool is_feature_enabled)
	auto_hal_lib_handle, "auto_hal_start_hfp_downlink")) \|\|		auto_hal_lib_handle, "auto_hal_start_hfp_downlink")) \|\|
	!(auto_hal_stop_hfp_downlink =		!(auto_hal_stop_hfp_downlink =
	(auto_hal_stop_hfp_downlink_t)dlsym(		(auto_hal_stop_hfp_downlink_t)dlsym(
	auto_hal_lib_handle, "auto_hal_stop_hfp_downlink"))) {		auto_hal_lib_handle, "auto_hal_stop_hfp_downlink")) \|\|
			!(auto_hal_get_input_snd_device =
			(auto_hal_get_input_snd_device_t)dlsym(
			auto_hal_lib_handle, "auto_hal_get_input_snd_device")) \|\|
			!(auto_hal_get_output_snd_device =
			(auto_hal_get_output_snd_device_t)dlsym(
			auto_hal_lib_handle, "auto_hal_get_output_snd_device"))) {
	ALOGE("%s: dlsym failed", __func__);		ALOGE("%s: dlsym failed", __func__);
	goto feature_disabled;		goto feature_disabled;
	}		}
	@@ -5561,12 +5568,13 @@ feature_disabled:
	auto_hal_get_car_audio_stream_from_address = NULL;		auto_hal_get_car_audio_stream_from_address = NULL;
	auto_hal_open_output_stream = NULL;		auto_hal_open_output_stream = NULL;
	auto_hal_is_bus_device_usecase = NULL;		auto_hal_is_bus_device_usecase = NULL;
	auto_hal_get_snd_device_for_car_audio_stream = NULL;
	auto_hal_get_audio_port = NULL;		auto_hal_get_audio_port = NULL;
	auto_hal_set_audio_port_config = NULL;		auto_hal_set_audio_port_config = NULL;
	auto_hal_set_parameters = NULL;		auto_hal_set_parameters = NULL;
	auto_hal_start_hfp_downlink = NULL;		auto_hal_start_hfp_downlink = NULL;
	auto_hal_stop_hfp_downlink = NULL;		auto_hal_stop_hfp_downlink = NULL;
			auto_hal_get_input_snd_device = NULL;
			auto_hal_get_output_snd_device = NULL;

	ALOGW(":: %s: ---- Feature AUTO_HAL is disabled ----", __func__);		ALOGW(":: %s: ---- Feature AUTO_HAL is disabled ----", __func__);
	return -ENOSYS;		return -ENOSYS;
	@@ -5586,6 +5594,8 @@ int audio_extn_auto_hal_init(struct audio_device *adev)
	auto_hal_init_config.fp_select_devices = select_devices;		auto_hal_init_config.fp_select_devices = select_devices;
	auto_hal_init_config.fp_disable_audio_route = disable_audio_route;		auto_hal_init_config.fp_disable_audio_route = disable_audio_route;
	auto_hal_init_config.fp_disable_snd_device = disable_snd_device;		auto_hal_init_config.fp_disable_snd_device = disable_snd_device;
			auto_hal_init_config.fp_adev_get_active_input = adev_get_active_input;
			auto_hal_init_config.fp_platform_set_echo_reference = platform_set_echo_reference;
	return auto_hal_init(adev, auto_hal_init_config);		return auto_hal_init(adev, auto_hal_init_config);
	}		}
	else		else
	@@ -5624,25 +5634,19 @@ int audio_extn_auto_hal_release_audio_patch(struct audio_hw_device *dev,
	int audio_extn_auto_hal_get_car_audio_stream_from_address(const char *address)		int audio_extn_auto_hal_get_car_audio_stream_from_address(const char *address)
	{		{
	return ((auto_hal_get_car_audio_stream_from_address) ?		return ((auto_hal_get_car_audio_stream_from_address) ?
	auto_hal_get_car_audio_stream_from_address(address): 0);		auto_hal_get_car_audio_stream_from_address(address): -ENOSYS);
	}		}

	int audio_extn_auto_hal_open_output_stream(struct stream_out *out)		int audio_extn_auto_hal_open_output_stream(struct stream_out *out)
	{		{
	return ((auto_hal_open_output_stream) ?		return ((auto_hal_open_output_stream) ?
	auto_hal_open_output_stream(out): 0);		auto_hal_open_output_stream(out): -ENOSYS);
	}		}

	bool audio_extn_auto_hal_is_bus_device_usecase(audio_usecase_t uc_id)		bool audio_extn_auto_hal_is_bus_device_usecase(audio_usecase_t uc_id)
	{		{
	return ((auto_hal_is_bus_device_usecase) ?		return ((auto_hal_is_bus_device_usecase) ?
	auto_hal_is_bus_device_usecase(uc_id): 0);		auto_hal_is_bus_device_usecase(uc_id): false);
	}

	snd_device_t audio_extn_auto_hal_get_snd_device_for_car_audio_stream(struct stream_out *out)
	{
	return ((auto_hal_get_snd_device_for_car_audio_stream) ?
	auto_hal_get_snd_device_for_car_audio_stream(out): 0);
	}		}

	int audio_extn_auto_hal_get_audio_port(struct audio_hw_device *dev,		int audio_extn_auto_hal_get_audio_port(struct audio_hw_device *dev,
	@@ -5679,6 +5683,20 @@ int audio_extn_auto_hal_stop_hfp_downlink(struct audio_device *adev,
	return ((auto_hal_stop_hfp_downlink) ?		return ((auto_hal_stop_hfp_downlink) ?
	auto_hal_stop_hfp_downlink(adev, uc_info): 0);		auto_hal_stop_hfp_downlink(adev, uc_info): 0);
	}		}

			snd_device_t audio_extn_auto_hal_get_input_snd_device(struct audio_device *adev,
			audio_usecase_t uc_id)
			{
			return ((auto_hal_get_input_snd_device) ?
			auto_hal_get_input_snd_device(adev, uc_id): SND_DEVICE_NONE);
			}

			snd_device_t audio_extn_auto_hal_get_output_snd_device(struct audio_device *adev,
			audio_usecase_t uc_id)
			{
			return ((auto_hal_get_output_snd_device) ?
			auto_hal_get_output_snd_device(adev, uc_id): SND_DEVICE_NONE);
			}
	// END: AUTO_HAL ===================================================================		// END: AUTO_HAL ===================================================================

	void audio_extn_feature_init()		void audio_extn_feature_init()

hal/audio_extn/audio_extn.h

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1315,7 +1315,6 @@ int audio_extn_auto_hal_release_audio_patch(struct audio_hw_device *dev,
	int audio_extn_auto_hal_get_car_audio_stream_from_address(const char *address);		int audio_extn_auto_hal_get_car_audio_stream_from_address(const char *address);
	int audio_extn_auto_hal_open_output_stream(struct stream_out *out);		int audio_extn_auto_hal_open_output_stream(struct stream_out *out);
	bool audio_extn_auto_hal_is_bus_device_usecase(audio_usecase_t uc_id);		bool audio_extn_auto_hal_is_bus_device_usecase(audio_usecase_t uc_id);
	snd_device_t audio_extn_auto_hal_get_snd_device_for_car_audio_stream(struct stream_out *out);
	int audio_extn_auto_hal_get_audio_port(struct audio_hw_device *dev,		int audio_extn_auto_hal_get_audio_port(struct audio_hw_device *dev,
	struct audio_port *config);		struct audio_port *config);
	int audio_extn_auto_hal_set_audio_port_config(struct audio_hw_device *dev,		int audio_extn_auto_hal_set_audio_port_config(struct audio_hw_device *dev,
	@@ -1326,11 +1325,16 @@ int audio_extn_auto_hal_start_hfp_downlink(struct audio_device *adev,
	struct audio_usecase *uc_info);		struct audio_usecase *uc_info);
	int audio_extn_auto_hal_stop_hfp_downlink(struct audio_device *adev,		int audio_extn_auto_hal_stop_hfp_downlink(struct audio_device *adev,
	struct audio_usecase *uc_info);		struct audio_usecase *uc_info);
			snd_device_t audio_extn_auto_hal_get_input_snd_device(struct audio_device *adev,
			audio_usecase_t uc_id);
			snd_device_t audio_extn_auto_hal_get_output_snd_device(struct audio_device *adev,
			audio_usecase_t uc_id);

	typedef streams_input_ctxt_t* (fp_in_get_stream_t)(struct audio_device, audio_io_handle_t);		typedef streams_input_ctxt_t* (fp_in_get_stream_t)(struct audio_device, audio_io_handle_t);
	typedef streams_output_ctxt_t* (fp_out_get_stream_t)(struct audio_device, audio_io_handle_t);		typedef streams_output_ctxt_t* (fp_out_get_stream_t)(struct audio_device, audio_io_handle_t);
	typedef size_t (*fp_get_output_period_size_t)(uint32_t, audio_format_t, int, int);		typedef size_t (*fp_get_output_period_size_t)(uint32_t, audio_format_t, int, int);
	typedef int (fp_audio_extn_ext_hw_plugin_set_audio_gain_t)(void, struct audio_usecase*, uint32_t);		typedef int (fp_audio_extn_ext_hw_plugin_set_audio_gain_t)(void, struct audio_usecase*, uint32_t);
			typedef struct stream_in* (fp_adev_get_active_input_t)(const struct audio_device);

	typedef struct auto_hal_init_config {		typedef struct auto_hal_init_config {
	fp_in_get_stream_t fp_in_get_stream;		fp_in_get_stream_t fp_in_get_stream;
	@@ -1343,6 +1347,8 @@ typedef struct auto_hal_init_config {
	fp_select_devices_t fp_select_devices;		fp_select_devices_t fp_select_devices;
	fp_disable_audio_route_t fp_disable_audio_route;		fp_disable_audio_route_t fp_disable_audio_route;
	fp_disable_snd_device_t fp_disable_snd_device;		fp_disable_snd_device_t fp_disable_snd_device;
			fp_adev_get_active_input_t fp_adev_get_active_input;
			fp_platform_set_echo_reference_t fp_platform_set_echo_reference;
	} auto_hal_init_config_t;		} auto_hal_init_config_t;
	// END: AUTO_HAL FEATURE ==================================================		// END: AUTO_HAL FEATURE ==================================================

hal/audio_extn/auto_hal.c

+143 −0

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,8 @@ static fp_audio_extn_ext_hw_plugin_set_audio_gain_t fp_audio_extn_ext_hw_plugin_
	static fp_select_devices_t fp_select_devices;		static fp_select_devices_t fp_select_devices;
	static fp_disable_audio_route_t fp_disable_audio_route;		static fp_disable_audio_route_t fp_disable_audio_route;
	static fp_disable_snd_device_t fp_disable_snd_device;		static fp_disable_snd_device_t fp_disable_snd_device;
			static fp_adev_get_active_input_t fp_adev_get_active_input;
			static fp_platform_set_echo_reference_t fp_platform_set_echo_reference;

	/* Auto hal module struct */		/* Auto hal module struct */
	static struct auto_hal_module *auto_hal = NULL;		static struct auto_hal_module *auto_hal = NULL;
	@@ -783,6 +785,145 @@ int auto_hal_stop_hfp_downlink(struct audio_device *adev,
	return ret;		return ret;
	}		}

			snd_device_t auto_hal_get_input_snd_device(struct audio_device *adev,
			audio_usecase_t uc_id)
			{
			snd_device_t snd_device = SND_DEVICE_NONE;
			audio_devices_t out_device = AUDIO_DEVICE_NONE;
			struct audio_usecase *usecase = NULL;
			struct stream_in *in = fp_adev_get_active_input(adev);
			audio_devices_t in_device = ((in == NULL) ?
			AUDIO_DEVICE_NONE : in->device)
			& ~AUDIO_DEVICE_BIT_IN;

			if (uc_id == USECASE_INVALID) {
			ALOGE("%s: Invalid usecase (%d)", __func__, uc_id);
			return -EINVAL;
			}

			usecase = fp_get_usecase_from_list(adev, uc_id);
			if (usecase == NULL) {
			ALOGE("%s: Could not find the usecase (%d)", __func__, uc_id);
			return -EINVAL;
			}

			if (usecase->stream.out == NULL) {
			ALOGE("%s: stream.out is NULL", __func__);
			return -EINVAL;
			}

			out_device = usecase->stream.out->devices;
			if (out_device == AUDIO_DEVICE_NONE \|\|
			out_device & AUDIO_DEVICE_BIT_IN) {
			ALOGE("%s: Invalid output devices (%#x)", __func__, out_device);
			return -EINVAL;
			}

			ALOGV("%s: output device(%#x), input device(%#x), usecase(%d)",
			__func__, out_device, in_device, uc_id);

			if (out_device & AUDIO_DEVICE_OUT_BUS) {
			/* usecase->id is token as judgement for HFP calls */
			switch (usecase->id) {
			case USECASE_AUDIO_HFP_SCO:
			case USECASE_AUDIO_HFP_SCO_WB:
			snd_device = SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP;
			if (adev->enable_hfp)
			fp_platform_set_echo_reference(adev, true, out_device);
			break;
			case USECASE_AUDIO_HFP_SCO_DOWNLINK:
			snd_device = SND_DEVICE_IN_BT_SCO_MIC;
			break;
			case USECASE_AUDIO_HFP_SCO_WB_DOWNLINK:
			snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;
			break;
			case USECASE_VOICE_CALL:
			snd_device = SND_DEVICE_IN_VOICE_SPEAKER_MIC;
			break;
			default:
			ALOGE("%s: Usecase (%d) not supported", __func__, uc_id);
			return -EINVAL;
			}
			} else {
			ALOGE("%s: Output devices (%#x) not supported", __func__, out_device);
			return -EINVAL;
			}

			return snd_device;
			}

			snd_device_t auto_hal_get_output_snd_device(struct audio_device *adev,
			audio_usecase_t uc_id)
			{
			snd_device_t snd_device = SND_DEVICE_NONE;
			audio_devices_t devices = AUDIO_DEVICE_NONE;
			struct audio_usecase *usecase = NULL;

			if (uc_id == USECASE_INVALID) {
			ALOGE("%s: Invalid usecase (%d)", __func__, uc_id);
			return -EINVAL;
			}

			usecase = fp_get_usecase_from_list(adev, uc_id);
			if (usecase == NULL) {
			ALOGE("%s: Could not find the usecase (%d)", __func__, uc_id);
			return -EINVAL;
			}

			if (usecase->stream.out == NULL) {
			ALOGE("%s: stream.out is NULL", __func__);
			return -EINVAL;
			}

			devices = usecase->stream.out->devices;
			if (devices == AUDIO_DEVICE_NONE \|\|
			devices & AUDIO_DEVICE_BIT_IN) {
			ALOGE("%s: Invalid output devices (%#x)", __func__, devices);
			return -EINVAL;
			}

			ALOGV("%s: output devices(%#x), usecase(%d)", __func__, devices, uc_id);

			if (devices & AUDIO_DEVICE_OUT_BUS) {
			/* usecase->id is token as judgement for HFP calls */
			switch (usecase->id) {
			case USECASE_AUDIO_HFP_SCO:
			snd_device = SND_DEVICE_OUT_BT_SCO;
			break;
			case USECASE_AUDIO_HFP_SCO_WB:
			snd_device = SND_DEVICE_OUT_BT_SCO_WB;
			break;
			case USECASE_AUDIO_HFP_SCO_DOWNLINK:
			case USECASE_AUDIO_HFP_SCO_WB_DOWNLINK:
			snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_HFP;
			break;
			case USECASE_VOICE_CALL:
			snd_device = SND_DEVICE_OUT_VOICE_SPEAKER;
			break;
			case USECASE_AUDIO_PLAYBACK_MEDIA:
			snd_device = SND_DEVICE_OUT_BUS_MEDIA;
			break;
			case USECASE_AUDIO_PLAYBACK_SYS_NOTIFICATION:
			snd_device = SND_DEVICE_OUT_BUS_SYS;
			break;
			case USECASE_AUDIO_PLAYBACK_NAV_GUIDANCE:
			snd_device = SND_DEVICE_OUT_BUS_NAV;
			break;
			case USECASE_AUDIO_PLAYBACK_PHONE:
			snd_device = SND_DEVICE_OUT_BUS_PHN;
			break;
			default:
			ALOGE("%s: Usecase (%d) not supported", __func__, uc_id);
			return -EINVAL;
			}
			} else {
			ALOGE("%s: Output devices (%#x) not supported", __func__, devices);
			return -EINVAL;
			}

			return snd_device;
			}

	int auto_hal_init(struct audio_device *adev, auto_hal_init_config_t init_config)		int auto_hal_init(struct audio_device *adev, auto_hal_init_config_t init_config)
	{		{
	int ret = 0;		int ret = 0;
	@@ -813,6 +954,8 @@ int auto_hal_init(struct audio_device *adev, auto_hal_init_config_t init_config)
	fp_select_devices = init_config.fp_select_devices;		fp_select_devices = init_config.fp_select_devices;
	fp_disable_audio_route = init_config.fp_disable_audio_route;		fp_disable_audio_route = init_config.fp_disable_audio_route;
	fp_disable_snd_device = init_config.fp_disable_snd_device;		fp_disable_snd_device = init_config.fp_disable_snd_device;
			fp_adev_get_active_input = init_config.fp_adev_get_active_input;
			fp_platform_set_echo_reference = init_config.fp_platform_set_echo_reference;

	return ret;		return ret;
	}		}

hal/audio_hw.c

+22 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2479,11 +2479,18 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id)
	ALOGE("%s: stream.out is NULL", __func__);		ALOGE("%s: stream.out is NULL", __func__);
	return -EINVAL;		return -EINVAL;
	}		}
			if (usecase->devices & AUDIO_DEVICE_OUT_BUS) {
			out_snd_device = audio_extn_auto_hal_get_output_snd_device(adev,
			uc_id);
			in_snd_device = audio_extn_auto_hal_get_input_snd_device(adev,
			uc_id);
			} else {
	out_snd_device = platform_get_output_snd_device(adev->platform,		out_snd_device = platform_get_output_snd_device(adev->platform,
	usecase->stream.out);		usecase->stream.out);
	in_snd_device = platform_get_input_snd_device(adev->platform,		in_snd_device = platform_get_input_snd_device(adev->platform,
	NULL,		NULL,
	usecase->stream.out->devices);		usecase->stream.out->devices);
			}
	usecase->devices = usecase->stream.out->devices;		usecase->devices = usecase->stream.out->devices;
	} else if (usecase->type == TRANSCODE_LOOPBACK_RX) {		} else if (usecase->type == TRANSCODE_LOOPBACK_RX) {
	if (usecase->stream.inout == NULL) {		if (usecase->stream.inout == NULL) {
	@@ -2564,6 +2571,9 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id)
	if (out_snd_device == SND_DEVICE_NONE) {		if (out_snd_device == SND_DEVICE_NONE) {
	struct stream_out *voip_out = adev->primary_output;		struct stream_out *voip_out = adev->primary_output;
	struct stream_in *voip_in = get_voice_communication_input(adev);		struct stream_in *voip_in = get_voice_communication_input(adev);
			if (usecase->devices & AUDIO_DEVICE_OUT_BUS)
			out_snd_device = audio_extn_auto_hal_get_output_snd_device(adev, uc_id);
			else
	out_snd_device = platform_get_output_snd_device(adev->platform,		out_snd_device = platform_get_output_snd_device(adev->platform,
	usecase->stream.out);		usecase->stream.out);
	voip_usecase = get_usecase_from_list(adev, USECASE_AUDIO_PLAYBACK_VOIP);		voip_usecase = get_usecase_from_list(adev, USECASE_AUDIO_PLAYBACK_VOIP);
	@@ -2627,8 +2637,9 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id)
	return 0;		return 0;
	}		}

	if ((is_btsco_device(out_snd_device,in_snd_device) && !adev->bt_sco_on) \|\|		if (!(usecase->devices & AUDIO_DEVICE_OUT_BUS) &&
	(is_a2dp_device(out_snd_device) && !audio_extn_a2dp_source_is_ready())) {		((is_btsco_device(out_snd_device,in_snd_device) && !adev->bt_sco_on) \|\|
			(is_a2dp_device(out_snd_device) && !audio_extn_a2dp_source_is_ready()))) {
	ALOGD("SCO/A2DP is selected but they are not connected/ready hence dont route");		ALOGD("SCO/A2DP is selected but they are not connected/ready hence dont route");
	return 0;		return 0;
	}		}

hal/msm8974/platform.c

+3 −5