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

link: avoid getting params

Browse source 
We don't need to iterate the port params again when we already
can reuse buffers from the ports.
This commit is contained in:
Wim Taymans 2018-02-13 10:48:33 +01:00
parent cc53023fb9
commit 96fdfc86f7
1 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/pipewire/link.c
View file

@ -552,14 +552,31 @@ static int do_allocation(struct pw_link *this, uint32_t in_state, uint32_t out_s
spa_debug_port_info(oinfo);
spa_debug_port_info(iinfo);
}
if (this->buffers == NULL) {
if (this->buffers == NULL && output->n_buffers) {
out_flags = 0;
in_flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
this->n_buffers = output->n_buffers;
this->buffers = output->buffers;
this->buffer_owner = output;
pw_log_debug("link %p: reusing %d output buffers %p", this, this->n_buffers,
this->buffers);
} else if (this->buffers == NULL && input->n_buffers && input->mix == NULL) {
out_flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
in_flags = 0;
this->n_buffers = input->n_buffers;
this->buffers = input->buffers;
this->buffer_owner = input;
pw_log_debug("link %p: reusing %d input buffers %p", this, this->n_buffers,
this->buffers);
} else if (this->buffers == NULL) {
struct spa_pod **params, *param;
uint8_t buffer[4096];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer));
int i, offset, n_params;
uint32_t max_buffers;
size_t minsize = 1024, stride = 0;
size_t data_sizes[1];
ssize_t data_strides[1];
n_params = param_filter(this, input, output, t->param.idBuffers, &b);
n_params += param_filter(this, input, output, t->param.idMeta, &b);
@ -605,26 +622,6 @@ static int do_allocation(struct pw_link *this, uint32_t in_state, uint32_t out_s
(out_flags & SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS))
minsize = 0;
if (output->n_buffers) {
out_flags = 0;
in_flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
this->n_buffers = output->n_buffers;
this->buffers = output->buffers;
this->buffer_owner = output;
pw_log_debug("link %p: reusing %d output buffers %p", this, this->n_buffers,
this->buffers);
} else if (input->n_buffers && input->mix == NULL) {
out_flags = SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS;
in_flags = 0;
this->n_buffers = input->n_buffers;
this->buffers = input->buffers;
this->buffer_owner = input;
pw_log_debug("link %p: reusing %d input buffers %p", this, this->n_buffers,
this->buffers);
} else {
size_t data_sizes[1];
ssize_t data_strides[1];
data_sizes[0] = minsize;
data_strides[0] = stride;
@ -640,7 +637,6 @@ static int do_allocation(struct pw_link *this, uint32_t in_state, uint32_t out_s
pw_log_debug("link %p: allocating %d buffers %p %zd %zd", this,
this->n_buffers, this->buffers, minsize, stride);
}
if (out_flags & SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS) {
if ((res = pw_port_alloc_buffers(output,