mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-12-18 08:56:45 -05:00
bluez5: Add support for 32KHz for lc3 codec
Fixes: b69e089648 ("bluez5: Add support for 32KHz sampling frequency")
This commit is contained in:
parent
b69e089648
commit
44df080482
1 changed files with 11 additions and 1 deletions
|
|
@ -460,8 +460,10 @@ static int conf_cmp(const bap_lc3_t *conf1, int res1, const bap_lc3_t *conf2, in
|
||||||
|
|
||||||
PREFER_BOOL(conf->channels & LC3_CHAN_2);
|
PREFER_BOOL(conf->channels & LC3_CHAN_2);
|
||||||
PREFER_BOOL(conf->channels & LC3_CHAN_1);
|
PREFER_BOOL(conf->channels & LC3_CHAN_1);
|
||||||
PREFER_BOOL(conf->rate & (LC3_CONFIG_FREQ_48KHZ | LC3_CONFIG_FREQ_24KHZ | LC3_CONFIG_FREQ_16KHZ | LC3_CONFIG_FREQ_8KHZ));
|
PREFER_BOOL(conf->rate & (LC3_CONFIG_FREQ_48KHZ | LC3_CONFIG_FREQ_32KHZ | \
|
||||||
|
LC3_CONFIG_FREQ_24KHZ | LC3_CONFIG_FREQ_16KHZ | LC3_CONFIG_FREQ_8KHZ));
|
||||||
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_48KHZ);
|
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_48KHZ);
|
||||||
|
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_32KHZ);
|
||||||
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_24KHZ);
|
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_24KHZ);
|
||||||
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_16KHZ);
|
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_16KHZ);
|
||||||
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_8KHZ);
|
PREFER_BOOL(conf->rate & LC3_CONFIG_FREQ_8KHZ);
|
||||||
|
|
@ -614,6 +616,11 @@ static int codec_enum_config(const struct media_codec *codec, uint32_t flags,
|
||||||
spa_pod_builder_int(b, 48000);
|
spa_pod_builder_int(b, 48000);
|
||||||
spa_pod_builder_int(b, 48000);
|
spa_pod_builder_int(b, 48000);
|
||||||
}
|
}
|
||||||
|
if (conf.rate & LC3_CONFIG_FREQ_32KHZ) {
|
||||||
|
if (i++ == 0)
|
||||||
|
spa_pod_builder_int(b, 32000);
|
||||||
|
spa_pod_builder_int(b, 32000);
|
||||||
|
}
|
||||||
if (conf.rate & LC3_CONFIG_FREQ_24KHZ) {
|
if (conf.rate & LC3_CONFIG_FREQ_24KHZ) {
|
||||||
if (i++ == 0)
|
if (i++ == 0)
|
||||||
spa_pod_builder_int(b, 24000);
|
spa_pod_builder_int(b, 24000);
|
||||||
|
|
@ -671,6 +678,9 @@ static int codec_validate_config(const struct media_codec *codec, uint32_t flags
|
||||||
case LC3_CONFIG_FREQ_48KHZ:
|
case LC3_CONFIG_FREQ_48KHZ:
|
||||||
info->info.raw.rate = 48000U;
|
info->info.raw.rate = 48000U;
|
||||||
break;
|
break;
|
||||||
|
case LC3_CONFIG_FREQ_32KHZ:
|
||||||
|
info->info.raw.rate = 32000U;
|
||||||
|
break;
|
||||||
case LC3_CONFIG_FREQ_24KHZ:
|
case LC3_CONFIG_FREQ_24KHZ:
|
||||||
info->info.raw.rate = 24000U;
|
info->info.raw.rate = 24000U;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue