mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

buffer: remove buffer id

Browse source 
The buffer id is not needed/used, we use the index of the buffer in the
buffer array when configuring the port.
This commit is contained in:
Wim Taymans 2019-01-07 17:57:03 +01:00
parent e918f9f77c
commit 5b7ddb0105
33 changed files with 167 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -563,6 +563,7 @@ impl_node_port_use_buffers(struct spa_node *node,
uint32_t type;
b->buf = buffers[i];
b->id = i;
b->flags = BUFFER_FLAG_OUT;
b->h = spa_buffer_find_meta_data(b->buf, SPA_META_Header, sizeof(*b->h));

6
spa/plugins/alsa/alsa-source.c
View file

@ -562,6 +562,7 @@ impl_node_port_use_buffers(struct spa_node *node,
struct spa_data *d = buffers[i]->datas;
b->buf = buffers[i];
b->id = i;
b->flags = 0;
b->h = spa_buffer_find_meta_data(b->buf, SPA_META_Header, sizeof(*b->h));
@ -579,7 +580,6 @@ impl_node_port_use_buffers(struct spa_node *node,
return 0;
}
static int
impl_node_port_alloc_buffers(struct spa_node *node,
enum spa_direction direction,
@ -687,9 +687,9 @@ static int impl_node_process(struct spa_node *node)
b = spa_list_first(&this->ready, struct buffer, link);
spa_list_remove(&b->link);
spa_log_trace(this->log, NAME " %p: dequeue buffer %d", node, b->buf->id);
spa_log_trace(this->log, NAME " %p: dequeue buffer %d", node, b->id);
io->buffer_id = b->buf->id;
io->buffer_id = b->id;
io->status = SPA_STATUS_HAVE_BUFFER;
return SPA_STATUS_HAVE_BUFFER;

6
spa/plugins/alsa/alsa-utils.c
View file

@ -716,9 +716,9 @@ again:
if (state->ready_offset >= size) {
spa_list_remove(&b->link);
SPA_FLAG_SET(b->flags, BUFFER_FLAG_OUT);
state->io->buffer_id = b->buf->id;
spa_log_trace(state->log, "alsa-util %p: reuse buffer %u", state, b->buf->id);
state->callbacks->reuse_buffer(state->callbacks_data, 0, b->buf->id);
state->io->buffer_id = b->id;
spa_log_trace(state->log, "alsa-util %p: reuse buffer %u", state, b->id);
state->callbacks->reuse_buffer(state->callbacks_data, 0, b->id);
state->ready_offset = 0;
}
written += n_frames;

3
spa/plugins/alsa/alsa-utils.h
View file

@ -57,10 +57,11 @@ struct props {
#define MAX_BUFFERS 32
struct buffer {
uint32_t id;
uint32_t flags;
struct spa_buffer *buf;
struct spa_meta_header *h;
#define BUFFER_FLAG_OUT (1<<0)
uint32_t flags;
struct spa_list link;
};