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

spa: add context to debug functions

Browse source 
Add new spa_debugc_ funnctions that take a context. The user should also
redefine the spa_debugc macro to handle the context.

Use this to let some plugins log the pod and format to the log without
using the global logger.

Also use this to remove our custom pod logger function by reusing the
spa one with a custom context.
This commit is contained in:
Wim Taymans 2023-01-18 13:09:00 +01:00
parent f472fd736d
commit 3c67821c4a
14 changed files with 158 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

13
spa/plugins/videoconvert/videoadapter.c
View file

@ -45,10 +45,8 @@
#define SPA_LOG_TOPIC_DEFAULT log_topic
static struct spa_log_topic *log_topic = &SPA_LOG_TOPIC(0, "spa.videoadapter");
static struct spa_log *global_log;
#undef spa_debug
#define spa_debug(...) spa_log_debug(global_log, __VA_ARGS__)
#undef spa_debugc
#define spa_debugc(l,...) spa_log_debug(l, __VA_ARGS__)
#include <spa/debug/format.h>
#include <spa/debug/pod.h>
@ -304,7 +302,7 @@ static int debug_params(struct impl *this, struct spa_node *node,
if (filter) {
spa_log_error(this->log, "with this filter:");
spa_debug_pod(2, NULL, filter);
spa_debugc_pod(this->log, 2, NULL, filter);
} else {
spa_log_error(this->log, "there was no filter");
}
@ -322,7 +320,7 @@ static int debug_params(struct impl *this, struct spa_node *node,
break;
}
spa_log_error(this->log, "unmatched %s %d:", debug, count);
spa_debug_pod(2, NULL, param);
spa_debugc_pod(this->log, 2, NULL, param);
count++;
}
if (count == 0)
@ -448,7 +446,7 @@ static int configure_format(struct impl *this, uint32_t flags, const struct spa_
spa_log_debug(this->log, "%p: configure format:", this);
if (format && spa_log_level_enabled(this->log, SPA_LOG_LEVEL_DEBUG))
spa_debug_format(0, NULL, format);
spa_debugc_format(this->log, 0, NULL, format);
if ((res = spa_node_port_set_param(this->follower,
this->direction, 0,
@ -1579,7 +1577,6 @@ impl_init(const struct spa_handle_factory *factory,
this->log = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_Log);
spa_log_topic_init(this->log, log_topic);
global_log = this->log;
this->cpu = spa_support_find(support, n_support, SPA_TYPE_INTERFACE_CPU);