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: ensure temp buffers are large enough

Browse source 
Ensure that our temporary buffers can hold at least quantum_limit
samples. When no output or input is connected, we can generate up
to a quantum_limit of silence, which requires all the buffers to
be scaled correctly.

Fixes a segfault in mpv.
This commit is contained in:
Wim Taymans 2022-07-01 15:25:37 +02:00
parent e0b3e06bea
commit 9af9450888
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -221,9 +221,7 @@ struct impl {
uint32_t empty_size; uint32_t empty_size;
float *empty; float *empty;
float *scratch; float *scratch;
float *tmp; float *tmp[2];
float *tmp2;
float *tmp_datas[2][MAX_PORTS]; float *tmp_datas[2][MAX_PORTS];
}; };
@ -1489,9 +1487,9 @@ static int setup_convert(struct impl *this)
return res; return res;
for (i = 0; i < MAX_PORTS; i++) { for (i = 0; i < MAX_PORTS; i++) {
this->tmp_datas[0][i] = SPA_PTROFF(this->tmp, this->empty_size * i, void); this->tmp_datas[0][i] = SPA_PTROFF(this->tmp[0], this->empty_size * i, void);
this->tmp_datas[0][i] = SPA_PTR_ALIGN(this->tmp_datas[0][i], MAX_ALIGN, void); this->tmp_datas[0][i] = SPA_PTR_ALIGN(this->tmp_datas[0][i], MAX_ALIGN, void);
this->tmp_datas[1][i] = SPA_PTROFF(this->tmp2, this->empty_size * i, void); this->tmp_datas[1][i] = SPA_PTROFF(this->tmp[1], this->empty_size * i, void);
this->tmp_datas[1][i] = SPA_PTR_ALIGN(this->tmp_datas[1][i], MAX_ALIGN, void); this->tmp_datas[1][i] = SPA_PTR_ALIGN(this->tmp_datas[1][i], MAX_ALIGN, void);
} }
@ -2007,7 +2005,8 @@ impl_node_port_use_buffers(void *object,
clear_buffers(this, port); clear_buffers(this, port);
maxsize = 0; maxsize = this->quantum_limit * sizeof(float);
for (i = 0; i < n_buffers; i++) { for (i = 0; i < n_buffers; i++) {
struct buffer *b; struct buffer *b;
uint32_t n_datas = buffers[i]->n_datas; uint32_t n_datas = buffers[i]->n_datas;
@ -2048,10 +2047,10 @@ impl_node_port_use_buffers(void *object,
if (maxsize > this->empty_size) { if (maxsize > this->empty_size) {
this->empty = realloc(this->empty, maxsize + MAX_ALIGN); this->empty = realloc(this->empty, maxsize + MAX_ALIGN);
this->scratch = realloc(this->scratch, maxsize + MAX_ALIGN); this->scratch = realloc(this->scratch, maxsize + MAX_ALIGN);
this->tmp = realloc(this->tmp, (4 * maxsize + MAX_ALIGN) * MAX_PORTS); this->tmp[0] = realloc(this->tmp[0], (maxsize + MAX_ALIGN) * MAX_PORTS);
this->tmp2 = realloc(this->tmp2, (4 * maxsize + MAX_ALIGN) * MAX_PORTS); this->tmp[1] = realloc(this->tmp[1], (maxsize + MAX_ALIGN) * MAX_PORTS);
if (this->empty == NULL || this->scratch == NULL || if (this->empty == NULL || this->scratch == NULL ||
this->tmp == NULL || this->tmp2 == NULL) this->tmp[0] == NULL || this->tmp[1] == NULL)
return -errno; return -errno;
memset(this->empty, 0, maxsize + MAX_ALIGN); memset(this->empty, 0, maxsize + MAX_ALIGN);
this->empty_size = maxsize; this->empty_size = maxsize;
@ -2639,8 +2638,8 @@ static int impl_clear(struct spa_handle *handle)
free(this->dir[SPA_DIRECTION_OUTPUT].ports[i]); free(this->dir[SPA_DIRECTION_OUTPUT].ports[i]);
free(this->empty); free(this->empty);
free(this->scratch); free(this->scratch);
free(this->tmp); free(this->tmp[0]);
free(this->tmp2); free(this->tmp[1]);
if (this->resample.free) if (this->resample.free)
resample_free(&this->resample); resample_free(&this->resample);