mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: lc3: fix log name conflict

Browse source
This commit is contained in:
Pauli Virtanen 2024-12-14 12:32:24 +02:00 • committed by Wim Taymans
parent 3309fa0674
commit 8f1983d14c
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
spa/plugins/bluez5/bap-codec-lc3.c
View file

@ -23,7 +23,7 @@
#define MAX_PACS 64 #define MAX_PACS 64
static struct spa_log *log; static struct spa_log *log_;
struct impl { struct impl {
lc3_encoder_t enc[LC3_MAX_CHANNELS]; lc3_encoder_t enc[LC3_MAX_CHANNELS];
@ -787,7 +787,7 @@ static int pac_cmp(const void *p1, const void *p2)
{ {
const struct pac_data *pac1 = p1; const struct pac_data *pac1 = p1;
const struct pac_data *pac2 = p2; const struct pac_data *pac2 = p2;
struct spa_debug_log_ctx debug_ctx = SPA_LOG_DEBUG_INIT(log, SPA_LOG_LEVEL_TRACE); struct spa_debug_log_ctx debug_ctx = SPA_LOG_DEBUG_INIT(log_, SPA_LOG_LEVEL_TRACE);
bap_lc3_t conf1, conf2; bap_lc3_t conf1, conf2;
int res1, res2; int res1, res2;
@ -809,7 +809,7 @@ static int codec_select_config(const struct media_codec *codec, uint32_t flags,
uint32_t locations = 0; uint32_t locations = 0;
uint32_t channel_allocation = 0; uint32_t channel_allocation = 0;
bool sink = false, duplex = false; bool sink = false, duplex = false;
struct spa_debug_log_ctx debug_ctx = SPA_LOG_DEBUG_INIT(log, SPA_LOG_LEVEL_TRACE); struct spa_debug_log_ctx debug_ctx = SPA_LOG_DEBUG_INIT(log_, SPA_LOG_LEVEL_TRACE);
int i; int i;
if (caps == NULL) if (caps == NULL)
@ -824,7 +824,7 @@ static int codec_select_config(const struct media_codec *codec, uint32_t flags,
} }
if (spa_atob(spa_dict_lookup(settings, "bluez5.bap.debug"))) if (spa_atob(spa_dict_lookup(settings, "bluez5.bap.debug")))
debug_ctx = SPA_LOG_DEBUG_INIT(log, SPA_LOG_LEVEL_DEBUG); debug_ctx = SPA_LOG_DEBUG_INIT(log_, SPA_LOG_LEVEL_DEBUG);
/* Is remote endpoint sink or source */ /* Is remote endpoint sink or source */
sink = spa_atob(spa_dict_lookup(settings, "bluez5.bap.sink")); sink = spa_atob(spa_dict_lookup(settings, "bluez5.bap.sink"));
@ -1051,7 +1051,7 @@ static int codec_get_qos(const struct media_codec *codec,
conf.framelen, conf.framelen); conf.framelen, conf.framelen);
if (!bap_qos) { if (!bap_qos) {
/* shouldn't happen: select_config should pick existing one */ /* shouldn't happen: select_config should pick existing one */
spa_log_error(log, "no QoS settings found"); spa_log_error(log_, "no QoS settings found");
return -EINVAL; return -EINVAL;
} }
@ -1109,7 +1109,7 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
goto error; goto error;
if (!parse_conf(&conf, config, config_len)) { if (!parse_conf(&conf, config, config_len)) {
spa_log_error(log, "invalid LC3 config"); spa_log_error(log_, "invalid LC3 config");
res = -ENOTSUP; res = -ENOTSUP;
goto error; goto error;
} }
@ -1130,12 +1130,12 @@ static void *codec_init(const struct media_codec *codec, uint32_t flags,
goto error; goto error;
} }
spa_log_info(log, "LC3 rate:%d frame_duration:%d channels:%d framelen:%d nblks:%d", spa_log_info(log_, "LC3 rate:%d frame_duration:%d channels:%d framelen:%d nblks:%d",
this->samplerate, this->frame_dus, this->channels, this->framelen, conf.n_blks); this->samplerate, this->frame_dus, this->channels, this->framelen, conf.n_blks);
res = lc3_frame_samples(this->frame_dus, this->samplerate); res = lc3_frame_samples(this->frame_dus, this->samplerate);
if (res < 0) { if (res < 0) {
spa_log_error(log, "invalid LC3 frame samples"); spa_log_error(log_, "invalid LC3 frame samples");
res = -EINVAL; res = -EINVAL;
goto error; goto error;
} }
@ -1300,8 +1300,8 @@ static int codec_increase_bitpool(void *data)
static void codec_set_log(struct spa_log *global_log) static void codec_set_log(struct spa_log *global_log)
{ {
log = global_log; log_ = global_log;
spa_log_topic_init(log, &codec_plugin_log_topic); spa_log_topic_init(log_, &codec_plugin_log_topic);
} }
static int codec_get_bis_config(const struct media_codec *codec, uint8_t *caps, static int codec_get_bis_config(const struct media_codec *codec, uint8_t *caps,