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

audioconvert: improve negotiation

Browse source
This commit is contained in:
Wim Taymans 2018-05-24 16:09:31 +02:00
parent ef9fcd1093
commit 2d34a405e8
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spa/plugins/audioconvert/audioconvert.c
View file

@ -291,7 +291,7 @@ static int setup_convert(struct impl *this)
{ {
struct port *inport, *outport; struct port *inport, *outport;
struct spa_node *prev = NULL; struct spa_node *prev = NULL;
int i, res; int i, j, res;
struct type *t = &this->type; struct type *t = &this->type;
inport = GET_PORT(this, SPA_DIRECTION_INPUT, 0); inport = GET_PORT(this, SPA_DIRECTION_INPUT, 0);
@ -331,20 +331,19 @@ static int setup_convert(struct impl *this)
make_link(this, prev, 0, this->channelmix, 0, NULL); make_link(this, prev, 0, this->channelmix, 0, NULL);
prev = this->channelmix; prev = this->channelmix;
} }
make_link(this, prev, 0, this->fmt_out, 0, NULL); make_link(this, prev, 0, this->fmt_out, 0, NULL);
/* pack */ /* pack */
make_link(this, this->fmt_out, 0, NULL, 0, &outport->format); make_link(this, this->fmt_out, 0, NULL, 0, &outport->format);
for (i = 0, j = this->n_links - 1; j >= i; i++, j--) {
if ((res = negotiate_link_format(this, &this->links[0])) < 0)
return res;
if ((res = negotiate_link_format(this, &this->links[this->n_links-1])) < 0)
return res;
for (i = 1; i < this->n_links-1; i++)
if ((res = negotiate_link_format(this, &this->links[i])) < 0) if ((res = negotiate_link_format(this, &this->links[i])) < 0)
return res; return res;
if ((res = negotiate_link_format(this, &this->links[j])) < 0)
return res;
}
spa_node_port_set_io(inport->node, SPA_DIRECTION_INPUT, 0, spa_node_port_set_io(inport->node, SPA_DIRECTION_INPUT, 0,
t->io.Buffers, inport->io, sizeof(struct spa_io_buffers)); t->io.Buffers, inport->io, sizeof(struct spa_io_buffers));