diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 12:59:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-26 13:00:09 +0100 |
| commit | 05412f4cd41e6742bb1847a12e8c323d5f8031bb (patch) | |
| tree | c5bcec66a1c8ceb76b88c9b83c753847e1f7a2ad /libavfilter/af_compand.c | |
| parent | 5e02ff3e3d1522dcf37cd62314250116750fc0e2 (diff) | |
| download | ffmpeg-05412f4cd41e6742bb1847a12e8c323d5f8031bb.tar.gz | |
avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_compand.c')
| -rw-r--r-- | libavfilter/af_compand.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 24472f7985..226c7a7519 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -290,6 +290,7 @@ static int compand_drain(AVFilterLink *outlink) int chan, i, dindex; AVFrame *frame = NULL; + /* 2048 is to limit output frame size during drain */ frame = ff_get_audio_buffer(outlink, FFMIN(2048, s->delay_count)); if (!frame) return AVERROR(ENOMEM); @@ -305,7 +306,8 @@ static int compand_drain(AVFilterLink *outlink) dindex = s->delay_index; for (i = 0; i < frame->nb_samples; i++) { - dst[i] = av_clipd(dbuf[dindex] * get_volume(s, cp->volume), -1, 1); + dst[i] = av_clipd(dbuf[dindex] * get_volume(s, cp->volume), + -1, 1); dindex = MOD(dindex + 1, s->delay_samples); } } @@ -320,7 +322,7 @@ static int config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; CompandContext *s = ctx->priv; const int sample_rate = outlink->sample_rate; - double radius = s->curve_dB * M_LN10 / 20; + double radius = s->curve_dB * M_LN10 / 20.0; int nb_attacks, nb_decays, nb_points; char *p, *saveptr = NULL; const int channels = outlink->channels; @@ -338,7 +340,7 @@ static int config_output(AVFilterLink *outlink) return AVERROR(EINVAL); } - if ((nb_attacks > channels) || (nb_decays > channels)) { + if (nb_attacks > channels || nb_decays > channels) { av_log(ctx, AV_LOG_ERROR, "Number of attacks/decays bigger than number of channels.\n"); return AVERROR(EINVAL); } |