mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: make sure mandatory codecs are always enabled

Browse source 
It should not be possible to disable mandatory codecs: csvd, sbc, lc3
This commit is contained in:
Pauli Virtanen 2025-06-09 20:55:43 +03:00 • committed by Wim Taymans
parent 9f34e962a6
commit 52fc22a76b
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -551,7 +551,15 @@ static int media_endpoint_to_profile(const char *endpoint)
static bool is_media_codec_enabled(struct spa_bt_monitor *monitor, const struct media_codec *codec)
{
return spa_dict_lookup(&monitor->enabled_codecs, codec->name) != NULL;
/* Mandatory codecs are always enabled */
switch (codec->id) {
case SPA_BLUETOOTH_AUDIO_CODEC_SBC:
case SPA_BLUETOOTH_AUDIO_CODEC_CVSD:
case SPA_BLUETOOTH_AUDIO_CODEC_LC3:
return true;
default:
return spa_dict_lookup(&monitor->enabled_codecs, codec->name) != NULL;
}
}
static bool codec_has_direction(const struct media_codec *codec, enum spa_bt_media_direction direction)
@ -6606,8 +6614,6 @@ static int parse_codec_array(struct spa_bt_monitor *this, const struct spa_dict
if (spa_dict_lookup_item(&this->enabled_codecs, codec->name) != NULL)
continue;
spa_log_debug(this->log, "enabling codec %s", codec->name);
spa_assert(this->enabled_codecs.n_items < num_codecs);
codecs[this->enabled_codecs.n_items].key = codec->name;
@ -6622,8 +6628,8 @@ static int parse_codec_array(struct spa_bt_monitor *this, const struct spa_dict
for (i = 0; media_codecs[i]; ++i) {
const struct media_codec *codec = media_codecs[i];
if (!is_media_codec_enabled(this, codec))
spa_log_debug(this->log, "disabling codec %s", codec->name);
spa_log_debug(this->log, "codec %s: %s", codec->name,
is_media_codec_enabled(this, codec) ? "enabled" : "disabled");
}
return 0;