Snap for 5087486 from 75da01e5f207d7e587cc390da5c4ea78882ae2d6 to pi-qpr2-release (53080281) · Commits · e / os / android_hardware_qcom_audio

hal/audio_extn/a2dp.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -748,8 +748,6 @@ static int close_a2dp_output()
		if (a2dp.audio_stream_close() == false)
		ALOGE("%s: failed close A2DP control path from Bluetooth IPC library", __func__);
		}
		if (a2dp.abr_config.is_abr_enabled && a2dp.abr_config.abr_started)
		stop_abr();
		a2dp_common_init();
		a2dp.enc_sampling_rate = 0;
		a2dp.enc_channels = 0;
		@@ -1559,8 +1557,7 @@ int audio_extn_a2dp_set_parameters(struct str_parms parms, bool reconfig)
		val = atoi(value);
		if (audio_is_a2dp_out_device(val)) {
		ALOGV("%s: Received device disconnect request", __func__);
		reset_a2dp_enc_config_params();
		reset_a2dp_dec_config_params();
		reset_a2dp_config();
		close_a2dp_output();
		}
		goto param_handled;

+11 −4

Original line number	Diff line number	Diff line
		@@ -1437,10 +1437,17 @@ platform_backend_config_init(struct platform_data *pdata)
		pdata->current_backend_cfg[USB_AUDIO_TX_BACKEND].channels_mixer_ctl =
		strdup("USB_AUDIO_TX Channels");

		if (strstr(pdata->snd_card_name, "intcodec")) {
		pdata->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
		strdup("INT0_MI2S_RX Format");
		pdata->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
		strdup("INT0_MI2S_RX SampleRate");
		} else {
		pdata->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
		strdup("SLIM_6_RX Format");
		pdata->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
		strdup("SLIM_6_RX SampleRate");
		}

		pdata->current_backend_cfg[USB_AUDIO_RX_BACKEND].bitwidth_mixer_ctl =
		strdup("USB_AUDIO_RX Format");