mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-15 08:56:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

audioadapter: improve error reporting

Browse source 
Improve the debug_params output.
Always either print the failed filter or that there was no filter.
Print the index of the enumerated failed param or a message when
there are no params.

See #2383
This commit is contained in:
Wim Taymans 2022-05-17 09:52:48 +02:00
parent 970b5906a8
commit 411b12f59e
1 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

53
spa/plugins/audioconvert/audioadapter.c
View file

@ -282,38 +282,45 @@ static int debug_params(struct impl *this, struct spa_node *node,
enum spa_direction direction, uint32_t port_id, uint32_t id, struct spa_pod *filter, enum spa_direction direction, uint32_t port_id, uint32_t id, struct spa_pod *filter,
const char *debug, int err) const char *debug, int err)
{ {
struct spa_pod_builder b = { 0 }; struct spa_pod_builder b = { 0 };
uint8_t buffer[4096]; uint8_t buffer[4096];
uint32_t state; uint32_t state;
struct spa_pod *param; struct spa_pod *param;
int res; int res, count = 0;
spa_log_error(this->log, "params %s: %d:%d (%s) %s", spa_log_error(this->log, "params %s: %d:%d (%s) %s",
spa_debug_type_find_name(spa_type_param, id), spa_debug_type_find_name(spa_type_param, id),
direction, port_id, debug, spa_strerror(err)); direction, port_id, debug, err ? spa_strerror(err) : "no matching params");
if (err == -EBUSY) if (err == -EBUSY)
return 0; return 0;
state = 0; if (filter) {
while (true) { spa_log_error(this->log, "with this filter:");
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_debug_pod(2, NULL, filter);
res = spa_node_port_enum_params_sync(node, } else {
direction, port_id, spa_log_error(this->log, "there was no filter");
id, &state, }
NULL, &param, &b);
if (res != 1) { state = 0;
while (true) {
spa_pod_builder_init(&b, buffer, sizeof(buffer));
res = spa_node_port_enum_params_sync(node,
direction, port_id,
id, &state,
NULL, &param, &b);
if (res != 1) {
if (res < 0) if (res < 0)
spa_log_error(this->log, " error: %s", spa_strerror(res)); spa_log_error(this->log, " error: %s", spa_strerror(res));
break; break;
} }
spa_debug_pod(2, NULL, param); spa_log_error(this->log, "unmatched %s %d:", debug, count);
} spa_debug_pod(2, NULL, param);
count++;
}
if (count == 0)
spa_log_error(this->log, "could not get any %s", debug);
spa_log_error(this->log, "failed filter:"); return 0;
if (filter)
spa_debug_pod(2, NULL, filter);
return 0;
} }
static int negotiate_buffers(struct impl *this) static int negotiate_buffers(struct impl *this)