mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

resample-peaks: fix peaks resampler

Browse source 
Avoid some segfaults in some cases.

fixes #3320
This commit is contained in:
Wim Taymans 2023-07-05 13:46:08 +02:00
parent 178f452127
commit 48bf039e25
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spa/plugins/audioconvert/resample-peaks.c
View file

@ -39,13 +39,13 @@ static void resample_peaks_process(struct resample *r,
end = ((uint64_t) (o_count + 1) end = ((uint64_t) (o_count + 1)
* r->i_rate) / r->o_rate; * r->i_rate) / r->o_rate;
end = end > i_count ? end - i_count : 0; end = end > i_count ? end - i_count : 0;
chunk = SPA_MIN(end, *in_len); chunk = SPA_MIN(end, *in_len - i);
m = peaks_abs_max(&pd->peaks, &s[i], chunk - i, m); m = peaks_abs_max(&pd->peaks, &s[i], chunk, m);
i += chunk; i += chunk;
if (i == end) { if (chunk == end) {
d[o++] = m; d[o++] = m;
m = 0.0f; m = 0.0f;
o_count++; o_count++;
@ -58,7 +58,7 @@ static void resample_peaks_process(struct resample *r,
pd->o_count = o_count; pd->o_count = o_count;
pd->i_count = i_count + i; pd->i_count = i_count + i;
while (pd->i_count >= r->i_rate) { while (pd->i_count >= r->i_rate && pd->o_count >= r->o_rate) {
pd->i_count -= r->i_rate; pd->i_count -= r->i_rate;
pd->o_count -= r->o_rate; pd->o_count -= r->o_rate;
} }