diff options
author | James Almer <jamrial@gmail.com> | 2021-08-31 11:03:14 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:46 -0300 |
commit | 1f96db959c1235bb7079d354e09914a0a2608f62 (patch) | |
tree | 21ac480d5b148c0524761853e6badb3a90a7ca3f /libavfilter/af_sidechaincompress.c | |
parent | 8a5896ec1f635ccf0d726f7ba7a06649ebeebf25 (diff) |
avfilter: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/af_sidechaincompress.c')
-rw-r--r-- | libavfilter/af_sidechaincompress.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c index c0ce82066b..90d2a2c726 100644 --- a/libavfilter/af_sidechaincompress.c +++ b/libavfilter/af_sidechaincompress.c @@ -177,13 +177,13 @@ static void compressor(SidechainCompressContext *s, abs_sample = fabs(scsrc[0] * level_sc); if (s->link == 1) { - for (c = 1; c < sclink->channels; c++) + for (c = 1; c < sclink->ch_layout.nb_channels; c++) abs_sample = FFMAX(fabs(scsrc[c] * level_sc), abs_sample); } else { - for (c = 1; c < sclink->channels; c++) + for (c = 1; c < sclink->ch_layout.nb_channels; c++) abs_sample += fabs(scsrc[c] * level_sc); - abs_sample /= sclink->channels; + abs_sample /= sclink->ch_layout.nb_channels; } if (s->detection) @@ -206,12 +206,12 @@ static void compressor(SidechainCompressContext *s, s->compressed_knee_stop, s->detection, s->mode); - for (c = 0; c < inlink->channels; c++) + for (c = 0; c < inlink->ch_layout.nb_channels; c++) dst[c] = src[c] * level_in * (gain * makeup * mix + (1. - mix)); - src += inlink->channels; - dst += inlink->channels; - scsrc += sclink->channels; + src += inlink->ch_layout.nb_channels; + dst += inlink->ch_layout.nb_channels; + scsrc += sclink->ch_layout.nb_channels; } } @@ -325,8 +325,8 @@ static int config_output(AVFilterLink *outlink) outlink->time_base = ctx->inputs[0]->time_base; - s->fifo[0] = av_audio_fifo_alloc(ctx->inputs[0]->format, ctx->inputs[0]->channels, 1024); - s->fifo[1] = av_audio_fifo_alloc(ctx->inputs[1]->format, ctx->inputs[1]->channels, 1024); + s->fifo[0] = av_audio_fifo_alloc(ctx->inputs[0]->format, ctx->inputs[0]->ch_layout.nb_channels, 1024); + s->fifo[1] = av_audio_fifo_alloc(ctx->inputs[1]->format, ctx->inputs[1]->ch_layout.nb_channels, 1024); if (!s->fifo[0] || !s->fifo[1]) return AVERROR(ENOMEM); |