diff options
| author | David Flater <dave@flaterco.com> | 2022-08-14 21:53:10 -0400 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2022-08-23 12:20:05 +0200 |
| commit | d2b6ec1e273d2554c19e4f189adb0cb40acf401e (patch) | |
| tree | 2de352e4675938f7726a335a6155cace5ea8f684 | |
| parent | 1adfd28f9e0e4cca8aa01edfd9bf653b98bf4d3b (diff) | |
| download | ffmpeg-d2b6ec1e273d2554c19e4f189adb0cb40acf401e.tar.gz | |
avfilter/af_alimiter: fix misbehavior when nb_channels != 2
Some code in alimiter assumes that there are 2 channels, resulting in
clipping if the loudest channel is 3 or above and an out-of-bounds read if
the input is monophonic. Fix that in 2 places.
Signed-off-by: David Flater <dave@flaterco.com>
| -rw-r--r-- | libavfilter/af_alimiter.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c index 622dc66324..c683c4bcf4 100644 --- a/libavfilter/af_alimiter.c +++ b/libavfilter/af_alimiter.c @@ -194,10 +194,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } else { for (i = s->nextiter; i < s->nextiter + s->nextlen; i++) { int j = i % buffer_size; - double ppeak, pdelta; + double ppeak = 0, pdelta; - ppeak = fabs(buffer[nextpos[j]]) > fabs(buffer[nextpos[j] + 1]) ? - fabs(buffer[nextpos[j]]) : fabs(buffer[nextpos[j] + 1]); + for (c = 0; c < channels; c++) { + ppeak = FFMAX(ppeak, fabs(buffer[nextpos[j] + c])); + } pdelta = (limit / peak - limit / ppeak) / (((buffer_size - nextpos[j] + s->pos) % buffer_size) / channels); if (pdelta < nextdelta[j]) { nextdelta[j] = pdelta; @@ -241,14 +242,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) s->delta = get_rdelta(s, release, inlink->sample_rate, peak, limit, s->att, 1); if (s->nextlen > 1) { + double ppeak = 0, pdelta; int pnextpos = nextpos[(s->nextiter + 1) % buffer_size]; - double ppeak = fabs(buffer[pnextpos]) > fabs(buffer[pnextpos + 1]) ? - fabs(buffer[pnextpos]) : - fabs(buffer[pnextpos + 1]); - double pdelta = (limit / ppeak - s->att) / - (((buffer_size + pnextpos - - ((s->pos + channels) % buffer_size)) % - buffer_size) / channels); + + for (c = 0; c < channels; c++) { + ppeak = FFMAX(ppeak, fabs(buffer[pnextpos + c])); + } + pdelta = (limit / ppeak - s->att) / + (((buffer_size + pnextpos - + ((s->pos + channels) % buffer_size)) % + buffer_size) / channels); if (pdelta < s->delta) s->delta = pdelta; } |