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

alsa: small cleanups

Browse source 
Use flags for buffers
This commit is contained in:
Wim Taymans 2018-03-08 11:02:21 +01:00
parent 5bff143eaf
commit e7bff4293d
4 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
spa/plugins/alsa/alsa-sink.c
View file

@ -490,7 +490,7 @@ impl_node_port_use_buffers(struct spa_node *node,
uint32_t type;
b->outbuf = buffers[i];
b->outstanding = true;
b->flags = BUFFER_FLAG_OUT;
b->h = spa_buffer_find_meta(b->outbuf, this->type.meta.Header);
@ -582,10 +582,12 @@ static int impl_node_process_input(struct spa_node *node)
input = this->io;
spa_return_val_if_fail(input != NULL, -EIO);
spa_log_trace(this->log, NAME " %p: process input %d %d", this, input->status, input->buffer_id);
if (input->status == SPA_STATUS_HAVE_BUFFER && input->buffer_id < this->n_buffers) {
struct buffer *b = &this->buffers[input->buffer_id];
if (!b->outstanding) {
if (!SPA_FLAG_CHECK(b->flags, BUFFER_FLAG_OUT)) {
spa_log_warn(this->log, NAME " %p: buffer %u in use", this, input->buffer_id);
input->status = -EINVAL;
return -EINVAL;
@ -594,10 +596,11 @@ static int impl_node_process_input(struct spa_node *node)
spa_log_trace(this->log, NAME " %p: queue buffer %u", this, input->buffer_id);
spa_list_append(&this->ready, &b->link);
b->outstanding = false;
input->buffer_id = SPA_ID_INVALID;
input->status = SPA_STATUS_OK;
SPA_FLAG_UNSET(b->flags, BUFFER_FLAG_OUT);
}
input->buffer_id = SPA_ID_INVALID;
input->status = SPA_STATUS_OK;
return SPA_STATUS_OK;
}