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

spa: use dyanmic builder for audioadapter

Browse source
This commit is contained in:
Wim Taymans 2022-03-01 21:17:08 +01:00
parent cdf1b15d38
commit 3d7ea3ee17
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@
#include <spa/buffer/alloc.h> #include <spa/buffer/alloc.h>
#include <spa/pod/parser.h> #include <spa/pod/parser.h>
#include <spa/pod/filter.h> #include <spa/pod/filter.h>
#include <spa/pod/dynamic.h>
#include <spa/param/param.h> #include <spa/param/param.h>
#include <spa/param/audio/format-utils.h> #include <spa/param/audio/format-utils.h>
#include <spa/param/latency-utils.h> #include <spa/param/latency-utils.h>
@ -142,8 +143,8 @@ static int impl_node_enum_params(void *object, int seq,
const struct spa_pod *filter) const struct spa_pod *filter)
{ {
struct impl *this = object; struct impl *this = object;
struct spa_pod_builder b = { 0 };
uint8_t buffer[4096]; uint8_t buffer[4096];
struct spa_pod_dynamic_builder b;
struct spa_result_node_params result; struct spa_result_node_params result;
uint32_t count = 0; uint32_t count = 0;
int res; int res;
@ -158,7 +159,7 @@ next:
spa_log_debug(this->log, "%p: %d id:%u", this, seq, id); spa_log_debug(this->log, "%p: %d id:%u", this, seq, id);
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_dynamic_builder_init(&b, buffer, sizeof(buffer), 4096);
switch (id) { switch (id) {
case SPA_PARAM_EnumPortConfig: case SPA_PARAM_EnumPortConfig:
@ -166,35 +167,38 @@ next:
res = spa_node_enum_params(this->convert, seq, id, start, num, filter); res = spa_node_enum_params(this->convert, seq, id, start, num, filter);
return res; return res;
case SPA_PARAM_PropInfo: case SPA_PARAM_PropInfo:
if ((res = follower_enum_params(this, res = follower_enum_params(this,
id, IDX_PropInfo, &result, filter, &b)) != 1) id, IDX_PropInfo, &result, filter, &b.b);
return res;
break; break;
case SPA_PARAM_Props: case SPA_PARAM_Props:
if ((res = follower_enum_params(this, res = follower_enum_params(this,
id, IDX_Props, &result, filter, &b)) != 1) id, IDX_Props, &result, filter, &b.b);
return res;
break; break;
case SPA_PARAM_ProcessLatency: case SPA_PARAM_ProcessLatency:
if ((res = follower_enum_params(this, res = follower_enum_params(this,
id, IDX_ProcessLatency, &result, filter, &b)) != 1) id, IDX_ProcessLatency, &result, filter, &b.b);
return res;
break; break;
case SPA_PARAM_EnumFormat: case SPA_PARAM_EnumFormat:
case SPA_PARAM_Format: case SPA_PARAM_Format:
case SPA_PARAM_Latency: case SPA_PARAM_Latency:
if ((res = spa_node_port_enum_params_sync(this->follower, res = spa_node_port_enum_params_sync(this->follower,
this->direction, 0, this->direction, 0,
id, &result.next, filter, &result.param, &b)) != 1) id, &result.next, filter, &result.param, &b.b);
return res;
break; break;
default: default:
return -ENOENT; return -ENOENT;
} }
spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result); if (res == 1) {
spa_node_emit_result(&this->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
count++;
}
spa_pod_dynamic_builder_clean(&b);
if (++count != num) if (res != 1)
return res;
if (count != num)
goto next; goto next;
return 0; return 0;