mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fmt-ops: allocate shaper memory dynamically

Browse source 
It is based on the number of channels so allocate it dynamically.
This commit is contained in:
Wim Taymans 2025-10-24 12:46:38 +02:00
parent d18670d7bb
commit f7c3d37969
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spa/plugins/audioconvert/fmt-ops.c
View file

@ -551,7 +551,7 @@ int convert_init(struct convert *conv)
const struct dither_info *dinfo; const struct dither_info *dinfo;
const struct noise_info *ninfo; const struct noise_info *ninfo;
const struct clear_info *cinfo; const struct clear_info *cinfo;
uint32_t i, conv_flags, data_size[3]; uint32_t i, conv_flags, data_size[4];
/* we generate int32 bits of random values. With this scale /* we generate int32 bits of random values. With this scale
* factor, we bring this in the [-1.0, 1.0] range */ * factor, we bring this in the [-1.0, 1.0] range */
@ -615,15 +615,17 @@ int convert_init(struct convert *conv)
data_size[0] = SPA_ROUND_UP(conv->noise_size * sizeof(float), FMT_OPS_MAX_ALIGN); data_size[0] = SPA_ROUND_UP(conv->noise_size * sizeof(float), FMT_OPS_MAX_ALIGN);
data_size[1] = SPA_ROUND_UP(RANDOM_SIZE * sizeof(uint32_t), FMT_OPS_MAX_ALIGN); data_size[1] = SPA_ROUND_UP(RANDOM_SIZE * sizeof(uint32_t), FMT_OPS_MAX_ALIGN);
data_size[2] = SPA_ROUND_UP(RANDOM_SIZE * sizeof(int32_t), FMT_OPS_MAX_ALIGN); data_size[2] = SPA_ROUND_UP(RANDOM_SIZE * sizeof(int32_t), FMT_OPS_MAX_ALIGN);
data_size[3] = SPA_ROUND_UP(conv->n_channels * sizeof(struct shaper), FMT_OPS_MAX_ALIGN);
conv->data = calloc(FMT_OPS_MAX_ALIGN + conv->data = calloc(FMT_OPS_MAX_ALIGN +
data_size[0] + data_size[1] + data_size[2], 1); data_size[0] + data_size[1] + data_size[2] + data_size[3], 1);
if (conv->data == NULL) if (conv->data == NULL)
return -errno; return -errno;
conv->noise = SPA_PTR_ALIGN(conv->data, FMT_OPS_MAX_ALIGN, float); conv->noise = SPA_PTR_ALIGN(conv->data, FMT_OPS_MAX_ALIGN, float);
conv->random = SPA_PTROFF(conv->noise, data_size[0], uint32_t); conv->random = SPA_PTROFF(conv->noise, data_size[0], uint32_t);
conv->prev = SPA_PTROFF(conv->random, data_size[1], int32_t); conv->prev = SPA_PTROFF(conv->random, data_size[1], int32_t);
conv->shaper = SPA_PTROFF(conv->prev, data_size[2], struct shaper);
for (i = 0; i < RANDOM_SIZE; i++) for (i = 0; i < RANDOM_SIZE; i++)
conv->random[i] = random(); conv->random[i] = random();

2
spa/plugins/audioconvert/fmt-ops.h
View file

@ -236,7 +236,7 @@ struct convert {
uint32_t noise_size; uint32_t noise_size;
const float *ns; const float *ns;
uint32_t n_ns; uint32_t n_ns;
struct shaper shaper[64]; struct shaper *shaper;
void (*update_noise) (struct convert *conv, float *noise, uint32_t n_samples); void (*update_noise) (struct convert *conv, float *noise, uint32_t n_samples);
void (*process) (struct convert *conv, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src[], void (*process) (struct convert *conv, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src[],