mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-16 07:00:00 -05:00
Meta: rework ringbuffer meta
ringbuffer: remove size and mask from the ringbuffer, we have that elsewhere in the user of the ringbuffer. Remove the buffer data offset and size fields and replace with a ringbuffer. We then have a ringbuffer in all buffer data, which simplifies things. We can now remove the ringbuffer metadata.
This commit is contained in:
Wim Taymans
parent
49d8f6792e
commit
2923b623b3
27 changed files with 199 additions and 374 deletions
|
|
@ -60,7 +60,6 @@ struct buffer {
|
|||
struct spa_list link;
|
||||
void *ptr;
|
||||
bool mapped;
|
||||
struct spa_meta_ringbuffer *rb;
|
||||
};
|
||||
|
||||
struct data {
|
||||
|
|
@ -245,8 +244,8 @@ static int impl_port_enum_params(struct spa_node *node,
|
|||
":", t->param_buffers.size, "iru", 1024,
|
||||
2, 32, 4096,
|
||||
":", t->param_buffers.stride, "i", 0,
|
||||
":", t->param_buffers.buffers, "iru", 2,
|
||||
2, 2, 32,
|
||||
":", t->param_buffers.buffers, "iru", 1,
|
||||
2, 1, 32,
|
||||
":", t->param_buffers.align, "i", 16);
|
||||
}
|
||||
else if (id == t->param.idMeta) {
|
||||
|
|
@ -257,17 +256,6 @@ static int impl_port_enum_params(struct spa_node *node,
|
|||
":", t->param_meta.type, "I", t->meta.Header,
|
||||
":", t->param_meta.size, "i", sizeof(struct spa_meta_header));
|
||||
break;
|
||||
case 1:
|
||||
param = spa_pod_builder_object(builder,
|
||||
id, t->param_meta.Meta,
|
||||
":", t->param_meta.type, "I", t->meta.Ringbuffer,
|
||||
":", t->param_meta.size, "i", sizeof(struct spa_meta_ringbuffer),
|
||||
":", t->param_meta.ringbufferSize, "ir", 1024 * 4,
|
||||
2, 16 * 4, INT32_MAX / 4,
|
||||
":", t->param_meta.ringbufferStride, "i", 0,
|
||||
":", t->param_meta.ringbufferBlocks, "i", 1,
|
||||
":", t->param_meta.ringbufferAlign, "i", 16);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -348,7 +336,6 @@ static int impl_port_use_buffers(struct spa_node *node, enum spa_direction direc
|
|||
return -EINVAL;
|
||||
}
|
||||
b->buffer = buffers[i];
|
||||
b->rb = spa_buffer_find_meta(buffers[i], d->type.meta.Ringbuffer);
|
||||
pw_log_info("got buffer %d size %d", i, datas[0].maxsize);
|
||||
spa_list_append(&d->empty, &b->link);
|
||||
}
|
||||
|
|
@ -376,7 +363,9 @@ static int impl_node_process_output(struct spa_node *node)
|
|||
int i, c, n_samples, avail;
|
||||
int16_t *dst;
|
||||
struct spa_port_io *io = d->io;
|
||||
uint32_t index = 0;
|
||||
uint32_t maxsize, index = 0;
|
||||
struct spa_ringbuffer *rb;
|
||||
uint32_t filled, offset;
|
||||
|
||||
if (io->buffer_id < d->n_buffers) {
|
||||
reuse_buffer(d, io->buffer_id);
|
||||
|
|
@ -389,22 +378,17 @@ static int impl_node_process_output(struct spa_node *node)
|
|||
b = spa_list_first(&d->empty, struct buffer, link);
|
||||
spa_list_remove(&b->link);
|
||||
|
||||
if (b->rb) {
|
||||
uint32_t filled, offset;
|
||||
maxsize = b->buffer->datas[0].maxsize;
|
||||
rb = &b->buffer->datas[0].chunk->area;
|
||||
|
||||
filled = spa_ringbuffer_get_write_index(&b->rb->ringbuffer, &index);
|
||||
avail = b->rb->ringbuffer.size - filled;
|
||||
offset = index % b->rb->ringbuffer.size;
|
||||
filled = spa_ringbuffer_get_write_index(rb, &index);
|
||||
avail = maxsize - filled;
|
||||
offset = index % maxsize;
|
||||
|
||||
if (offset + avail > b->rb->ringbuffer.size)
|
||||
avail = b->rb->ringbuffer.size - offset;
|
||||
if (offset + avail > maxsize)
|
||||
avail = maxsize - offset;
|
||||
|
||||
dst = SPA_MEMBER(b->ptr, offset, void);
|
||||
}
|
||||
else {
|
||||
dst = b->ptr;
|
||||
avail = b->buffer->datas[0].maxsize;
|
||||
}
|
||||
dst = SPA_MEMBER(b->ptr, offset, void);
|
||||
n_samples = avail / (sizeof(int16_t) * d->format.channels);
|
||||
|
||||
for (i = 0; i < n_samples; i++) {
|
||||
|
|
@ -420,14 +404,7 @@ static int impl_node_process_output(struct spa_node *node)
|
|||
*dst++ = val;
|
||||
}
|
||||
|
||||
if (b->rb) {
|
||||
spa_ringbuffer_write_update(&b->rb->ringbuffer, index + avail);
|
||||
}
|
||||
else {
|
||||
b->buffer->datas[0].chunk->offset = 0;
|
||||
b->buffer->datas[0].chunk->size = avail;
|
||||
b->buffer->datas[0].chunk->stride = 0;
|
||||
}
|
||||
spa_ringbuffer_write_update(rb, index + avail);
|
||||
|
||||
io->buffer_id = b->buffer->id;
|
||||
io->status = SPA_STATUS_HAVE_BUFFER;
|
||||
|
|
|
|||
|
|
@ -94,8 +94,8 @@ static void transport_reset_area(struct pw_client_node_transport *trans)
|
|||
trans->outputs[i].status = SPA_STATUS_OK;
|
||||
trans->outputs[i].buffer_id = SPA_ID_INVALID;
|
||||
}
|
||||
spa_ringbuffer_init(trans->input_buffer, INPUT_BUFFER_SIZE);
|
||||
spa_ringbuffer_init(trans->output_buffer, OUTPUT_BUFFER_SIZE);
|
||||
spa_ringbuffer_init(trans->input_buffer);
|
||||
spa_ringbuffer_init(trans->output_buffer);
|
||||
}
|
||||
|
||||
static void destroy(struct pw_client_node_transport *trans)
|
||||
|
|
@ -118,14 +118,14 @@ static int add_message(struct pw_client_node_transport *trans, struct pw_client_
|
|||
return -EINVAL;
|
||||
|
||||
filled = spa_ringbuffer_get_write_index(trans->output_buffer, &index);
|
||||
avail = trans->output_buffer->size - filled;
|
||||
avail = OUTPUT_BUFFER_SIZE - filled;
|
||||
size = SPA_POD_SIZE(message);
|
||||
if (avail < size)
|
||||
return -ENOSPC;
|
||||
|
||||
spa_ringbuffer_write_data(trans->output_buffer,
|
||||
trans->output_data,
|
||||
index & trans->output_buffer->mask, message, size);
|
||||
trans->output_data, OUTPUT_BUFFER_SIZE,
|
||||
index & (OUTPUT_BUFFER_SIZE - 1), message, size);
|
||||
spa_ringbuffer_write_update(trans->output_buffer, index + size);
|
||||
|
||||
return 0;
|
||||
|
|
@ -144,8 +144,8 @@ static int next_message(struct pw_client_node_transport *trans, struct pw_client
|
|||
return 0;
|
||||
|
||||
spa_ringbuffer_read_data(trans->input_buffer,
|
||||
trans->input_data,
|
||||
impl->current_index & trans->input_buffer->mask,
|
||||
trans->input_data, INPUT_BUFFER_SIZE,
|
||||
impl->current_index & (INPUT_BUFFER_SIZE - 1),
|
||||
&impl->current, sizeof(struct pw_client_node_message));
|
||||
|
||||
*message = impl->current;
|
||||
|
|
@ -164,8 +164,8 @@ static int parse_message(struct pw_client_node_transport *trans, void *message)
|
|||
size = SPA_POD_SIZE(&impl->current);
|
||||
|
||||
spa_ringbuffer_read_data(trans->input_buffer,
|
||||
trans->input_data,
|
||||
impl->current_index & trans->input_buffer->mask, message, size);
|
||||
trans->input_data, INPUT_BUFFER_SIZE,
|
||||
impl->current_index & (INPUT_BUFFER_SIZE - 1), message, size);
|
||||
spa_ringbuffer_read_update(trans->input_buffer, impl->current_index + size);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -304,7 +304,8 @@ static int driver_process_output(struct spa_node *node)
|
|||
op++;
|
||||
in_io->status = SPA_STATUS_NEED_BUFFER;
|
||||
}
|
||||
out->outbuf->datas[0].chunk->size = ctrl->buffer_size * sizeof(int16_t) * 2;
|
||||
|
||||
spa_ringbuffer_set_avail(&out->outbuf->datas[0].chunk->area, ctrl->buffer_size * sizeof(int16_t) * 2);
|
||||
|
||||
spa_hook_list_call(&nd->listener_list, struct pw_jack_node_events, push);
|
||||
gn->ready[SPA_DIRECTION_INPUT] = gn->required[SPA_DIRECTION_OUTPUT] = 0;
|
||||
|
|
|
|||
|
|
@ -244,26 +244,6 @@ static struct spa_pod *find_param(struct spa_pod **params, int n_params, uint32_
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static struct spa_pod *find_meta(struct pw_core *core, struct spa_pod **params,
|
||||
int n_params, uint32_t type)
|
||||
{
|
||||
uint32_t i;
|
||||
|
||||
for (i = 0; i < n_params; i++) {
|
||||
if (spa_pod_is_object_type (params[i], core->type.param_meta.Meta)) {
|
||||
uint32_t qtype;
|
||||
|
||||
if (spa_pod_object_parse(params[i],
|
||||
":", core->type.param_meta.type, "I", &qtype, NULL) < 0)
|
||||
continue;
|
||||
|
||||
if (qtype == type)
|
||||
return params[i];
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct spa_buffer **alloc_buffers(struct pw_link *this,
|
||||
uint32_t n_buffers,
|
||||
uint32_t n_params,
|
||||
|
|
@ -357,9 +337,6 @@ static struct spa_buffer **alloc_buffers(struct pw_link *this,
|
|||
msh->fd = mem->fd;
|
||||
msh->offset = data_size * i;
|
||||
msh->size = data_size;
|
||||
} else if (m->type == this->core->type.meta.Ringbuffer) {
|
||||
struct spa_meta_ringbuffer *rb = p;
|
||||
spa_ringbuffer_init(&rb->ringbuffer, data_sizes[0]);
|
||||
}
|
||||
p += m->size;
|
||||
}
|
||||
|
|
@ -381,8 +358,7 @@ static struct spa_buffer **alloc_buffers(struct pw_link *this,
|
|||
d->mapoffset = SPA_PTRDIFF(ddp, mem->ptr);
|
||||
d->maxsize = data_sizes[j];
|
||||
d->data = SPA_MEMBER(mem->ptr, d->mapoffset, void);
|
||||
d->chunk->offset = 0;
|
||||
d->chunk->size = data_sizes[j];
|
||||
spa_ringbuffer_set_avail(&d->chunk->area, 0);
|
||||
d->chunk->stride = data_strides[j];
|
||||
ddp += data_sizes[j];
|
||||
} else {
|
||||
|
|
@ -532,43 +508,29 @@ static int do_allocation(struct pw_link *this, uint32_t in_state, uint32_t out_s
|
|||
offset += SPA_ROUND_UP_N(SPA_POD_SIZE(params[i]), 8);
|
||||
}
|
||||
|
||||
param = find_meta(this->core, params, n_params, t->meta.Ringbuffer);
|
||||
max_buffers = MAX_BUFFERS;
|
||||
minsize = stride = 0;
|
||||
param = find_param(params, n_params, t->param_buffers.Buffers);
|
||||
if (param) {
|
||||
uint32_t ms, s;
|
||||
max_buffers = 1;
|
||||
uint32_t qmax_buffers = max_buffers,
|
||||
qminsize = minsize, qstride = stride;
|
||||
|
||||
if (spa_pod_object_parse(param,
|
||||
":", t->param_meta.ringbufferSize, "i", &ms,
|
||||
":", t->param_meta.ringbufferStride, "i", &s, NULL) >= 0) {
|
||||
minsize = ms;
|
||||
stride = s;
|
||||
}
|
||||
spa_pod_object_parse(param,
|
||||
":", t->param_buffers.size, "i", &qminsize,
|
||||
":", t->param_buffers.stride, "i", &qstride,
|
||||
":", t->param_buffers.buffers, "i", &qmax_buffers, NULL);
|
||||
|
||||
max_buffers =
|
||||
qmax_buffers == 0 ? max_buffers : SPA_MIN(qmax_buffers,
|
||||
max_buffers);
|
||||
minsize = SPA_MAX(minsize, qminsize);
|
||||
stride = SPA_MAX(stride, qstride);
|
||||
|
||||
pw_log_debug("%d %d %d -> %zd %zd %d", qminsize, qstride, qmax_buffers,
|
||||
minsize, stride, max_buffers);
|
||||
} else {
|
||||
max_buffers = MAX_BUFFERS;
|
||||
minsize = stride = 0;
|
||||
param = find_param(params, n_params,
|
||||
t->param_buffers.Buffers);
|
||||
if (param) {
|
||||
uint32_t qmax_buffers = max_buffers,
|
||||
qminsize = minsize, qstride = stride;
|
||||
|
||||
spa_pod_object_parse(param,
|
||||
":", t->param_buffers.size, "i", &qminsize,
|
||||
":", t->param_buffers.stride, "i", &qstride,
|
||||
":", t->param_buffers.buffers, "i", &qmax_buffers, NULL);
|
||||
|
||||
max_buffers =
|
||||
qmax_buffers == 0 ? max_buffers : SPA_MIN(qmax_buffers,
|
||||
max_buffers);
|
||||
minsize = SPA_MAX(minsize, qminsize);
|
||||
stride = SPA_MAX(stride, qstride);
|
||||
|
||||
pw_log_debug("%d %d %d -> %zd %zd %d", qminsize, qstride, qmax_buffers,
|
||||
minsize, stride, max_buffers);
|
||||
} else {
|
||||
pw_log_warn("no buffers param");
|
||||
minsize = 1024;
|
||||
}
|
||||
pw_log_warn("no buffers param");
|
||||
minsize = 1024;
|
||||
}
|
||||
|
||||
if ((in_flags & SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS) ||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue