mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-06-13 14:33:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

audioadapter: place (Enum)Format in (Enum)PortConfig

Browse source 
Enumerating the Format on a node does not make sense, this is a port or
stream only property.

Move the enum of the formats to the portconfig param, where it is used
to configure the port group.

This also makes it possible later to have multiple port groups on a node
and have the session manager configure and link them individually.
This commit is contained in:
Wim Taymans 2024-06-26 09:40:56 +02:00
parent b93c4f933d
commit 7798fb8b16
1 changed files with 55 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -171,15 +171,34 @@ static int convert_enum_port_config(struct impl *this,
int seq, uint32_t id, uint32_t start, uint32_t num, int seq, uint32_t id, uint32_t start, uint32_t num,
const struct spa_pod *filter, struct spa_pod_builder *builder) const struct spa_pod *filter, struct spa_pod_builder *builder)
{ {
struct spa_pod *f1, *f2 = NULL; struct spa_pod *f1, *f2 = NULL, *format = NULL;
struct spa_pod_frame f[1];
uint32_t fmt_id, fmt_start = 0;
int res; int res;
if (this->convert == NULL) if (this->convert == NULL)
return 0; return 0;
f1 = spa_pod_builder_add_object(builder, if (id == SPA_PARAM_EnumPortConfig)
SPA_TYPE_OBJECT_ParamPortConfig, id, fmt_id = SPA_PARAM_EnumFormat;
SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction)); else
fmt_id = SPA_PARAM_Format;
res = spa_node_port_enum_params_sync(this->follower,
this->direction, 0,
fmt_id, &fmt_start, NULL, &format, builder);
spa_pod_builder_push_object(builder, &f[0],
SPA_TYPE_OBJECT_ParamPortConfig, id);
spa_pod_builder_add(builder,
SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction),
0);
if (res > 0) {
spa_pod_builder_add(builder,
SPA_PARAM_PORT_CONFIG_format, SPA_POD_Pod(format),
0);
}
f1 = spa_pod_builder_pop(builder, &f[0]);
if (filter) { if (filter) {
if ((res = spa_pod_filter(builder, &f2, f1, filter)) < 0) if ((res = spa_pod_filter(builder, &f2, f1, filter)) < 0)
@ -222,13 +241,19 @@ next:
case SPA_PARAM_EnumPortConfig: case SPA_PARAM_EnumPortConfig:
case SPA_PARAM_PortConfig: case SPA_PARAM_PortConfig:
if (this->mode == SPA_PARAM_PORT_CONFIG_MODE_passthrough) { if (this->mode == SPA_PARAM_PORT_CONFIG_MODE_passthrough) {
struct spa_pod *format = NULL;
res = spa_node_port_enum_params_sync(this->follower,
this->direction, 0,
SPA_PARAM_Format, &result.index, NULL, &format, &b.b);
switch (result.index) { switch (result.index) {
case 0: case 0:
result.param = spa_pod_builder_add_object(&b.b, result.param = spa_pod_builder_add_object(&b.b,
SPA_TYPE_OBJECT_ParamPortConfig, id, SPA_TYPE_OBJECT_ParamPortConfig, id,
SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction), SPA_PARAM_PORT_CONFIG_direction, SPA_POD_Id(this->direction),
SPA_PARAM_PORT_CONFIG_mode, SPA_POD_Id( SPA_PARAM_PORT_CONFIG_mode, SPA_POD_Id(
SPA_PARAM_PORT_CONFIG_MODE_passthrough)); SPA_PARAM_PORT_CONFIG_MODE_passthrough),
SPA_PARAM_PORT_CONFIG_format, SPA_POD_Pod(format));
result.next++; result.next++;
res = 1; res = 1;
break; break;
@ -1448,20 +1473,33 @@ static void follower_port_info(void *data,
if (this->add_listener) if (this->add_listener)
continue; continue;
if (idx == IDX_Latency && this->in_recalc == 0) { switch (idx) {
case IDX_Latency:
if (this->in_recalc == 0) {
res = recalc_latency(this, this->follower, direction, port_id, this->target); res = recalc_latency(this, this->follower, direction, port_id, this->target);
spa_log_debug(this->log, "latency: %d (%s)", res, spa_log_debug(this->log, "latency: %d (%s)", res,
spa_strerror(res)); spa_strerror(res));
} }
if (idx == IDX_Tag && this->in_recalc == 0) { break;
case IDX_Tag:
if (this->in_recalc == 0) {
res = recalc_tag(this, this->follower, direction, port_id, this->target); res = recalc_tag(this, this->follower, direction, port_id, this->target);
spa_log_debug(this->log, "tag: %d (%s)", res, spa_log_debug(this->log, "tag: %d (%s)", res,
spa_strerror(res)); spa_strerror(res));
} }
if (idx == IDX_EnumFormat) { break;
spa_log_debug(this->log, "new EnumFormat from follower"); case IDX_Format:
spa_log_debug(this->log, "new format");
this->params[IDX_PortConfig].user++;
break;
case IDX_EnumFormat:
spa_log_debug(this->log, "new formats");
this->params[IDX_EnumPortConfig].user++;
/* we will renegotiate when restarting */ /* we will renegotiate when restarting */
this->recheck_format = true; this->recheck_format = true;
break;
default:
break;
} }
this->params[idx].user++; this->params[idx].user++;