mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

audiomixer: update io states more correctly

Browse source
This commit is contained in:
Wim Taymans 2018-03-08 10:07:44 +01:00
parent 1aa960ad54
commit 5bff143eaf
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
spa/plugins/audiomixer/audiomixer.c
View file

@ -783,10 +783,8 @@ static void recycle_buffer(struct impl *this, uint32_t id)
struct port *port = GET_OUT_PORT(this, 0); struct port *port = GET_OUT_PORT(this, 0);
struct buffer *b = &port->buffers[id]; struct buffer *b = &port->buffers[id];
if (!b->outstanding) { if (!b->outstanding)
spa_log_warn(this->log, NAME "%p: buffer %d not outstanding", this, id);
return; return;
}
spa_list_append(&port->queue, &b->link); spa_list_append(&port->queue, &b->link);
b->outstanding = false; b->outstanding = false;
@ -1009,7 +1007,7 @@ static int impl_node_process_output(struct spa_node *node)
struct impl *this; struct impl *this;
struct port *outport; struct port *outport;
struct spa_io_buffers *outio; struct spa_io_buffers *outio;
int i; int i, res;
size_t min_queued = SIZE_MAX; size_t min_queued = SIZE_MAX;
spa_return_val_if_fail(node != NULL, -EINVAL); spa_return_val_if_fail(node != NULL, -EINVAL);
@ -1020,8 +1018,10 @@ static int impl_node_process_output(struct spa_node *node)
outio = outport->io; outio = outport->io;
spa_return_val_if_fail(outio != NULL, -EIO); spa_return_val_if_fail(outio != NULL, -EIO);
if (outio->status == SPA_STATUS_HAVE_BUFFER) if (outio->status == SPA_STATUS_HAVE_BUFFER) {
return SPA_STATUS_HAVE_BUFFER; res = SPA_STATUS_HAVE_BUFFER;
goto done;
}
/* recycle */ /* recycle */
if (outio->buffer_id < outport->n_buffers) { if (outio->buffer_id < outport->n_buffers) {
@ -1039,7 +1039,7 @@ static int impl_node_process_output(struct spa_node *node)
min_queued = inport->queued_bytes; min_queued = inport->queued_bytes;
} }
if (min_queued != SIZE_MAX && min_queued > 0) { if (min_queued != SIZE_MAX && min_queued > 0) {
outio->status = mix_output(this, min_queued); res = outio->status = mix_output(this, min_queued);
} else { } else {
/* take requested output range and apply to input */ /* take requested output range and apply to input */
for (i = 0; i < this->last_port; i++) { for (i = 0; i < this->last_port; i++) {
@ -1058,8 +1058,11 @@ static int impl_node_process_output(struct spa_node *node)
inio->status = SPA_STATUS_NEED_BUFFER; inio->status = SPA_STATUS_NEED_BUFFER;
} }
} }
outio->status = SPA_STATUS_OK;
res = SPA_STATUS_NEED_BUFFER;
} }
return outio->status; done:
return res;
} }
static const struct spa_node impl_node = { static const struct spa_node impl_node = {