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

small cleanups

Browse source
This commit is contained in:
Wim Taymans 2017-08-27 09:16:03 +02:00
parent 28ae844de9
commit 6953642ed5
12 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -545,7 +545,7 @@ static int impl_node_process_input(struct spa_node *node)
input = this->io;
spa_return_val_if_fail(input != NULL, SPA_RESULT_WRONG_STATE);
if (input->status == SPA_RESULT_HAVE_BUFFER && input->buffer_id != SPA_ID_INVALID) {
if (input->status == SPA_RESULT_HAVE_BUFFER && input->buffer_id < this->n_buffers) {
struct buffer *b = &this->buffers[input->buffer_id];
if (!b->outstanding) {

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

@ -573,7 +573,7 @@ static int impl_node_process_output(struct spa_node *node)
if (io->status == SPA_RESULT_HAVE_BUFFER)
return SPA_RESULT_HAVE_BUFFER;
if (io->buffer_id != SPA_ID_INVALID) {
if (io->buffer_id < this->n_buffers) {
recycle_buffer(this, io->buffer_id);
io->buffer_id = SPA_ID_INVALID;
}

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

@ -732,11 +732,11 @@ static int impl_node_process_input(struct spa_node *node)
struct port *inport = GET_IN_PORT(this, i);
struct spa_port_io *inio;
if ((inio = inport->io) == NULL || inport->n_buffers == 0)
if ((inio = inport->io) == NULL)
continue;
if (inport->queued_bytes == 0 &&
inio->status == SPA_RESULT_HAVE_BUFFER && inio->buffer_id != SPA_ID_INVALID) {
inio->status == SPA_RESULT_HAVE_BUFFER && inio->buffer_id < inport->n_buffers) {
struct buffer *b = &inport->buffers[inio->buffer_id];
if (!b->outstanding) {
@ -788,7 +788,7 @@ static int impl_node_process_output(struct spa_node *node)
return SPA_RESULT_HAVE_BUFFER;
/* recycle */
if (outio->buffer_id != SPA_ID_INVALID) {
if (outio->buffer_id < outport->n_buffers) {
recycle_buffer(this, outio->buffer_id);
outio->buffer_id = SPA_ID_INVALID;
}

2
spa/plugins/audiotestsrc/audiotestsrc.c
View file

@ -862,7 +862,7 @@ static int impl_node_process_output(struct spa_node *node)
if (io->status == SPA_RESULT_HAVE_BUFFER)
return SPA_RESULT_HAVE_BUFFER;
if (io->buffer_id != SPA_ID_INVALID) {
if (io->buffer_id < this->n_buffers) {
reuse_buffer(this, this->io->buffer_id);
this->io->buffer_id = SPA_ID_INVALID;
}

2
spa/plugins/test/fakesink.c
View file

@ -656,7 +656,7 @@ static int impl_node_process_input(struct spa_node *node)
input = this->io;
spa_return_val_if_fail(input != NULL, SPA_RESULT_WRONG_STATE);
if (input->status == SPA_RESULT_HAVE_BUFFER && input->buffer_id != SPA_ID_INVALID) {
if (input->status == SPA_RESULT_HAVE_BUFFER && input->buffer_id < this->n_buffers) {
struct buffer *b = &this->buffers[input->buffer_id];
if (!b->outstanding) {

2
spa/plugins/test/fakesrc.c
View file

@ -711,7 +711,7 @@ static int impl_node_process_output(struct spa_node *node)
if (io->status == SPA_RESULT_HAVE_BUFFER)
return SPA_RESULT_HAVE_BUFFER;
if (io->buffer_id != SPA_ID_INVALID) {
if (io->buffer_id < this->n_buffers) {
reuse_buffer(this, this->io->buffer_id);
this->io->buffer_id = SPA_ID_INVALID;
}

2
spa/plugins/v4l2/v4l2-source.c
View file

@ -816,7 +816,7 @@ static int impl_node_process_output(struct spa_node *node)
if (io->status == SPA_RESULT_HAVE_BUFFER)
return SPA_RESULT_HAVE_BUFFER;
if (io->buffer_id != SPA_ID_INVALID) {
if (io->buffer_id < this->out_ports[0].n_buffers) {
res = spa_v4l2_buffer_recycle(this, io->buffer_id);
io->buffer_id = SPA_ID_INVALID;
}

2
spa/plugins/videotestsrc/videotestsrc.c
View file

@ -806,7 +806,7 @@ static int impl_node_process_output(struct spa_node *node)
if (io->status == SPA_RESULT_HAVE_BUFFER)
return SPA_RESULT_HAVE_BUFFER;
if (io->buffer_id != SPA_ID_INVALID) {
if (io->buffer_id < this->n_buffers) {
reuse_buffer(this, this->io->buffer_id);
this->io->buffer_id = SPA_ID_INVALID;
}

2
spa/plugins/volume/volume.c
View file

@ -750,7 +750,7 @@ static int impl_node_process_output(struct spa_node *node)
return SPA_RESULT_HAVE_BUFFER;
/* recycle */
if (output->buffer_id != SPA_ID_INVALID) {
if (output->buffer_id < out_port->n_buffers) {
recycle_buffer(this, output->buffer_id);
output->buffer_id = SPA_ID_INVALID;
}