mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-looback: improve data copy between streams

Browse source 
First go over all the input and collect pointers and the size that we
need to copy. Then go over all destinations and copy the source or
clear the buffer memory.

This fixes the problem where extra planes in the destination would get
a 0 size, which would make the converter produce 0 output. It also
ensure that the output size is consistent.
This commit is contained in:
Wim Taymans 2022-07-13 16:21:25 +02:00
parent 4062077472
commit 7a76e55c36
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/modules/module-loopback.c
View file

@ -189,33 +189,35 @@ static void capture_process(void *d)
pw_log_debug("out of playback buffers: %m"); pw_log_debug("out of playback buffers: %m");
if (in != NULL && out != NULL) { if (in != NULL && out != NULL) {
uint32_t outsize = UINT32_MAX;
int32_t stride = 0;
struct spa_data *d;
const void *src[in->buffer->n_datas];
for (i = 0; i < in->buffer->n_datas; i++) {
uint32_t offs, size;
d = &in->buffer->datas[i];
offs = SPA_MIN(d->chunk->offset, d->maxsize);
size = SPA_MIN(d->chunk->size, d->maxsize - offs);
src[i] = SPA_PTROFF(d->data, offs, void);
outsize = SPA_MIN(outsize, size);
stride = SPA_MAX(stride, d->chunk->stride);
}
for (i = 0; i < out->buffer->n_datas; i++) { for (i = 0; i < out->buffer->n_datas; i++) {
struct spa_data *ds, *dd; d = &out->buffer->datas[i];
uint32_t outsize = 0;
int32_t stride = 0;
dd = &out->buffer->datas[i]; outsize = SPA_MIN(outsize, d->maxsize);
if (i < in->buffer->n_datas) { if (i < in->buffer->n_datas)
uint32_t offs, size; memcpy(d->data, src[i], outsize);
else
memset(d->data, 0, outsize);
ds = &in->buffer->datas[i]; d->chunk->offset = 0;
d->chunk->size = outsize;
offs = SPA_MIN(ds->chunk->offset, ds->maxsize); d->chunk->stride = stride;
size = SPA_MIN(ds->chunk->size, ds->maxsize - offs);
stride = SPA_MAX(stride, stride);
memcpy(dd->data,
SPA_PTROFF(ds->data, offs, void), size);
outsize = SPA_MAX(outsize, size);
} else {
memset(dd->data, 0, outsize);
}
dd->chunk->offset = 0;
dd->chunk->size = outsize;
dd->chunk->stride = stride;
} }
} }