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

audioconvert: use preallocated empty buffer to drain

Browse source 
Avoid calling memset on a large piece of memory when draining
the resampler because it might use up all the allocated time in
our realtime thread. Instead use a prealloced empty buffer.
This commit is contained in:
Wim Taymans 2021-03-13 12:54:41 +01:00
parent d6be84ddd0
commit 801bd98233
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,6 +46,7 @@
#define DEFAULT_CHANNELS 2 #define DEFAULT_CHANNELS 2
#define MAX_SAMPLES 8192 #define MAX_SAMPLES 8192
#define MAX_ALIGN 16
#define MAX_BUFFERS 32 #define MAX_BUFFERS 32
struct impl; struct impl;
@ -121,6 +122,8 @@ struct impl {
unsigned int drained:1; unsigned int drained:1;
struct resample resample; struct resample resample;
float empty[MAX_SAMPLES + MAX_ALIGN];
}; };
#define CHECK_PORT(this,d,id) (id == 0) #define CHECK_PORT(this,d,id) (id == 0)
@ -815,30 +818,30 @@ static int impl_node_process(void *object)
flush_out = true; flush_out = true;
break; break;
} }
src_datas = alloca(sizeof(void*) * this->resample.channels);
dst_datas = alloca(sizeof(void*) * this->resample.channels);
if (size == 0) { if (size == 0) {
size = sb->datas[0].maxsize; size = sb->datas[0].maxsize;
for (i = 0; i < sb->n_datas; i++) for (i = 0; i < sb->n_datas; i++)
memset(sb->datas[i].data, 0, size); src_datas[i] = SPA_PTR_ALIGN(this->empty, MAX_ALIGN, void);
inport->offset = 0; inport->offset = 0;
flush_in = draining = true; flush_in = draining = true;
} else {
for (i = 0; i < sb->n_datas; i++)
src_datas[i] = SPA_MEMBER(sb->datas[i].data, inport->offset, void);
} }
for (i = 0; i < db->n_datas; i++)
dst_datas[i] = SPA_MEMBER(db->datas[i].data, outport->offset, void);
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);
src_datas = alloca(sizeof(void*) * this->resample.channels);
dst_datas = alloca(sizeof(void*) * this->resample.channels);
for (i = 0; i < sb->n_datas; i++)
src_datas[i] = SPA_MEMBER(sb->datas[i].data, inport->offset, void);
for (i = 0; i < db->n_datas; i++)
dst_datas[i] = SPA_MEMBER(db->datas[i].data, outport->offset, void);
#ifndef FASTPATH #ifndef FASTPATH
pin_len = in_len; pin_len = in_len;
pout_len = out_len; pout_len = out_len;
#endif #endif
passthrough = this->resample.i_rate == this->resample.o_rate && passthrough = this->resample.i_rate == this->resample.o_rate &&
(this->io_rate_match == NULL || (this->io_rate_match == NULL ||
!SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE)); !SPA_FLAG_IS_SET(this->io_rate_match->flags, SPA_IO_RATE_MATCH_FLAG_ACTIVE));