Merge "hal: retry a2dp path start up when failed" (27bbc623) · Commits · e / os / android_hardware_qcom_audio

hal/audio_extn/a2dp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2524,6 +2524,7 @@ int a2dp_start_playback()
		if (ret != 0 ) {
		ALOGE("BT controller start failed");
		a2dp.a2dp_source_started = false;
		ret = -ETIMEDOUT;
		} else {
		if (configure_a2dp_encoder_format() == true) {
		a2dp.a2dp_source_started = true;

hal/audio_hw.c

+31 −7

Original line number	Diff line number	Diff line
		@@ -1424,10 +1424,13 @@ int enable_snd_device(struct audio_device *adev,
		__func__, device_name);
		}

		if ((SND_DEVICE_OUT_BT_A2DP == snd_device) &&
		(audio_extn_a2dp_start_playback() < 0)) {
		if (SND_DEVICE_OUT_BT_A2DP == snd_device) {
		if (audio_extn_a2dp_start_playback() < 0) {
		ALOGE(" fail to configure A2dp Source control path ");
		goto err;
		} else {
		adev->a2dp_started = true;
		}
		}

		if ((SND_DEVICE_IN_BT_A2DP == snd_device) &&
		@@ -1534,9 +1537,10 @@ int disable_snd_device(struct audio_device *adev,
		audio_route_reset_and_update_path(adev->audio_route, device_name);
		}

		if (snd_device == SND_DEVICE_OUT_BT_A2DP)
		if (snd_device == SND_DEVICE_OUT_BT_A2DP) {
		audio_extn_a2dp_stop_playback();
		else if (snd_device == SND_DEVICE_IN_BT_A2DP)
		adev->a2dp_started = false;
		} else if (snd_device == SND_DEVICE_IN_BT_A2DP)
		audio_extn_a2dp_stop_capture();
		else if ((snd_device == SND_DEVICE_OUT_HDMI) \|\|
		(snd_device == SND_DEVICE_OUT_DISPLAY_PORT))
		@@ -3928,6 +3932,25 @@ int start_output_stream(struct stream_out *out)
		}
		} else {
		select_devices(adev, out->usecase);
		if (is_a2dp_out_device_type(&out->device_list) &&
		!adev->a2dp_started) {
		if (is_speaker_active \|\| is_speaker_safe_active) {
		struct listnode dev;
		list_init(&dev);
		assign_devices(&dev, &out->device_list);
		if (compare_device_type(&dev, AUDIO_DEVICE_OUT_SPEAKER_SAFE))
		reassign_device_list(&out->device_list,
		AUDIO_DEVICE_OUT_SPEAKER_SAFE, "");
		else
		reassign_device_list(&out->device_list,
		AUDIO_DEVICE_OUT_SPEAKER, "");
		select_devices(adev, out->usecase);
		assign_devices(&out->device_list, &dev);
		} else {
		ret = -EINVAL;
		goto error_open;
		}
		}
		}

		if (out->usecase == USECASE_INCALL_MUSIC_UPLINK \|\|
		@@ -10502,6 +10525,7 @@ static int adev_open(const hw_module_t module, const char name,
		adev->enable_hfp = false;
		adev->use_old_pspd_mix_ctrl = false;
		adev->adm_routing_changed = false;
		adev->a2dp_started = false;

		audio_extn_perf_lock_init();

hal/audio_hw.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -739,6 +739,7 @@ struct audio_device {
		struct listnode audio_patch_record_list;
		Hashmap *patch_map;
		Hashmap *io_streams_map;
		bool a2dp_started;
		bool ha_proxy_enable;
		};