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

Rename buffer status to make it more symetrical

Browse source 
Only try to pull once in a timeout.
We can reuse the last returned state as our internal state in
audiomixer.
This commit is contained in:
Wim Taymans 2017-04-28 11:49:13 +02:00
parent 430b749d53
commit cc8a5da9c7
11 changed files with 58 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pinos/server/client-node.c
View file

@ -855,7 +855,7 @@ spa_proxy_node_process_output (SpaNode *node)
pinos_log_trace ("%d %d %d %d", io->status, io->buffer_id, tmp.status, tmp.buffer_id);
if (io->status == SPA_RESULT_NEED_INPUT)
if (io->status == SPA_RESULT_NEED_BUFFER)
send_need = true;
*io = tmp;
@ -865,7 +865,7 @@ spa_proxy_node_process_output (SpaNode *node)
else if (flush)
do_flush (this);
return SPA_RESULT_HAVE_OUTPUT;
return SPA_RESULT_HAVE_BUFFER;
}
static SpaResult

10
pinos/server/node.c
View file

@ -273,7 +273,7 @@ do_pull (PinosNode *this)
pinos_log_trace ("node %p: need input port %d, %d %d", this,
inport->port_id, pi->buffer_id, pi->status);
if (pi->status != SPA_RESULT_NEED_INPUT)
if (pi->status != SPA_RESULT_NEED_BUFFER)
continue;
spa_list_for_each (link, &inport->rt.links, rt.input_link) {
@ -291,15 +291,15 @@ do_pull (PinosNode *this)
res = spa_node_process_output (outport->node->node);
if (res == SPA_RESULT_NEED_INPUT) {
if (res == SPA_RESULT_NEED_BUFFER) {
res = do_pull (outport->node);
pinos_log_trace ("node %p: pull return %d", outport->node, res);
}
else if (res < 0 && res != SPA_RESULT_HAVE_OUTPUT) {
else if (res < 0 && res != SPA_RESULT_HAVE_BUFFER) {
pinos_log_warn ("node %p: got process output %d", outport->node, res);
}
if (res == SPA_RESULT_HAVE_OUTPUT) {
if (res == SPA_RESULT_HAVE_BUFFER) {
*pi = *po;
pinos_log_trace ("node %p: have output %d %d", this, pi->status, pi->buffer_id);
have_output = true;
@ -360,7 +360,7 @@ on_node_event (SpaNode *node, SpaEvent *event, void *user_data)
}
}
res = spa_node_process_output (this->node);
if (res < 0 && res != SPA_RESULT_HAVE_OUTPUT)
if (res < 0 && res != SPA_RESULT_HAVE_BUFFER)
pinos_log_warn ("node %p: got process output %d", this, res);
}