mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Fix not updating sample spec when using Media API

Browse source 
When using transport configured via Media API sample spec needs to be
updated since codec configuration may affect it when e.g. headset
configure a different frequency or number of channels from default.
This commit is contained in:
Luiz Augusto von Dentz 2011-04-29 17:48:05 +03:00 • committed by Colin Guthrie
parent adb16f9ff4
commit 95422110ba
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -2156,6 +2156,8 @@ static int bt_transport_config_a2dp(struct userdata *u) {
config = (a2dp_sbc_t *) t->config; config = (a2dp_sbc_t *) t->config;
u->sample_spec.format = PA_SAMPLE_S16LE;
if (a2dp->sbc_initialized) if (a2dp->sbc_initialized)
sbc_reinit(&a2dp->sbc, 0); sbc_reinit(&a2dp->sbc, 0);
else else
@ -2165,15 +2167,19 @@ static int bt_transport_config_a2dp(struct userdata *u) {
switch (config->frequency) { switch (config->frequency) {
case BT_SBC_SAMPLING_FREQ_16000: case BT_SBC_SAMPLING_FREQ_16000:
a2dp->sbc.frequency = SBC_FREQ_16000; a2dp->sbc.frequency = SBC_FREQ_16000;
u->sample_spec.rate = 16000U;
break; break;
case BT_SBC_SAMPLING_FREQ_32000: case BT_SBC_SAMPLING_FREQ_32000:
a2dp->sbc.frequency = SBC_FREQ_32000; a2dp->sbc.frequency = SBC_FREQ_32000;
u->sample_spec.rate = 32000U;
break; break;
case BT_SBC_SAMPLING_FREQ_44100: case BT_SBC_SAMPLING_FREQ_44100:
a2dp->sbc.frequency = SBC_FREQ_44100; a2dp->sbc.frequency = SBC_FREQ_44100;
u->sample_spec.rate = 44100U;
break; break;
case BT_SBC_SAMPLING_FREQ_48000: case BT_SBC_SAMPLING_FREQ_48000:
a2dp->sbc.frequency = SBC_FREQ_48000; a2dp->sbc.frequency = SBC_FREQ_48000;
u->sample_spec.rate = 48000U;
break; break;
default: default:
pa_assert_not_reached(); pa_assert_not_reached();
@ -2182,15 +2188,19 @@ static int bt_transport_config_a2dp(struct userdata *u) {
switch (config->channel_mode) { switch (config->channel_mode) {
case BT_A2DP_CHANNEL_MODE_MONO: case BT_A2DP_CHANNEL_MODE_MONO:
a2dp->sbc.mode = SBC_MODE_MONO; a2dp->sbc.mode = SBC_MODE_MONO;
u->sample_spec.channels = 1;
break; break;
case BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL: case BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL:
a2dp->sbc.mode = SBC_MODE_DUAL_CHANNEL; a2dp->sbc.mode = SBC_MODE_DUAL_CHANNEL;
u->sample_spec.channels = 2;
break; break;
case BT_A2DP_CHANNEL_MODE_STEREO: case BT_A2DP_CHANNEL_MODE_STEREO:
a2dp->sbc.mode = SBC_MODE_STEREO; a2dp->sbc.mode = SBC_MODE_STEREO;
u->sample_spec.channels = 2;
break; break;
case BT_A2DP_CHANNEL_MODE_JOINT_STEREO: case BT_A2DP_CHANNEL_MODE_JOINT_STEREO:
a2dp->sbc.mode = SBC_MODE_JOINT_STEREO; a2dp->sbc.mode = SBC_MODE_JOINT_STEREO;
u->sample_spec.channels = 2;
break; break;
default: default:
pa_assert_not_reached(); pa_assert_not_reached();
@ -2257,6 +2267,9 @@ static int bt_transport_config_a2dp(struct userdata *u) {
static int bt_transport_config(struct userdata *u) { static int bt_transport_config(struct userdata *u) {
if (u->profile == PROFILE_HSP || u->profile == PROFILE_HFGW) { if (u->profile == PROFILE_HSP || u->profile == PROFILE_HFGW) {
u->block_size = u->link_mtu; u->block_size = u->link_mtu;
u->sample_spec.format = PA_SAMPLE_S16LE;
u->sample_spec.channels = 1;
u->sample_spec.rate = 8000;
return 0; return 0;
} }