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

resample: use a -1 buffer size to drain

Browse source 
Use the special -1 buffer size to start the drain so that we can
also handle 0 buffer sizes.
This commit is contained in:
Wim Taymans 2022-04-19 18:28:59 +02:00
parent cbef4a601f
commit 96286fb8b1
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spa/plugins/audioconvert/resample.c
View file

@ -979,7 +979,7 @@ static int impl_node_process(void *object)
return outio->status = inio->status; return outio->status = inio->status;
} }
inio->buffer_id = 0; inio->buffer_id = 0;
inport->buffers[0].outbuf->datas[0].chunk->size = 0; inport->buffers[0].outbuf->datas[0].chunk->size = -1;
} }
if (SPA_UNLIKELY(inio->buffer_id >= inport->n_buffers)) if (SPA_UNLIKELY(inio->buffer_id >= inport->n_buffers))
@ -993,7 +993,6 @@ static int impl_node_process(void *object)
sb = sbuf->outbuf; sb = sbuf->outbuf;
db = dbuf->outbuf; db = dbuf->outbuf;
size = sb->datas[0].chunk->size;
maxsize = db->datas[0].maxsize; maxsize = db->datas[0].maxsize;
if (SPA_LIKELY(this->io_position)) { if (SPA_LIKELY(this->io_position)) {
@ -1036,12 +1035,11 @@ static int impl_node_process(void *object)
src_datas = alloca(sizeof(void*) * this->resample.channels); src_datas = alloca(sizeof(void*) * this->resample.channels);
dst_datas = alloca(sizeof(void*) * this->resample.channels); dst_datas = alloca(sizeof(void*) * this->resample.channels);
if (inport->offset > size)
inport->offset = size;
if (outport->offset > maxsize) if (outport->offset > maxsize)
outport->offset = maxsize; outport->offset = maxsize;
if (size == 0) { size = sb->datas[0].chunk->size;
if (size == (uint32_t)-1) {
size = sb->datas[0].maxsize; size = sb->datas[0].maxsize;
memset(sb->datas[0].data, 0, size); memset(sb->datas[0].data, 0, size);
for (i = 0; i < sb->n_datas; i++) for (i = 0; i < sb->n_datas; i++)
@ -1049,6 +1047,9 @@ static int impl_node_process(void *object)
inport->offset = 0; inport->offset = 0;
flush_in = draining = true; flush_in = draining = true;
} else { } else {
size = SPA_MIN(size, maxsize);
if (inport->offset > size)
inport->offset = size;
for (i = 0; i < sb->n_datas; i++) for (i = 0; i < sb->n_datas; i++)
src_datas[i] = SPA_PTROFF(sb->datas[i].data, inport->offset, void); src_datas[i] = SPA_PTROFF(sb->datas[i].data, inport->offset, void);
} }
@ -1058,7 +1059,6 @@ static int impl_node_process(void *object)
in_len = (size - inport->offset) / sizeof(float); in_len = (size - inport->offset) / sizeof(float);
out_len = (maxsize - outport->offset) / sizeof(float); out_len = (maxsize - outport->offset) / sizeof(float);
#ifndef FASTPATH #ifndef FASTPATH
pin_len = in_len; pin_len = in_len;
pout_len = out_len; pout_len = out_len;