]> git.sesse.net Git - ffmpeg/blobdiff - libavfilter/af_sidechaincompress.c
lavfi/af_amix: fix memory leak
[ffmpeg] / libavfilter / af_sidechaincompress.c
index 1dce1c0fb071c487158912e2083080bad3c5ea7a..dac4605d0ce630d29cab93b6807cf0167b0c3be7 100644 (file)
@@ -38,6 +38,8 @@
 typedef struct SidechainCompressContext {
     const AVClass *class;
 
+    double level_in;
+    double level_sc;
     double attack, attack_coeff;
     double release, release_coeff;
     double lin_slope;
@@ -50,6 +52,7 @@ typedef struct SidechainCompressContext {
     double knee_start;
     double knee_stop;
     double lin_knee_start;
+    double adj_knee_start;
     double compressed_knee_stop;
     int link;
     int detection;
@@ -62,38 +65,27 @@ typedef struct SidechainCompressContext {
 #define F AV_OPT_FLAG_FILTERING_PARAM
 
 static const AVOption options[] = {
-    { "threshold", "set threshold",    OFFSET(threshold), AV_OPT_TYPE_DOUBLE, {.dbl=0.125}, 0.000976563,    1, A|F },
-    { "ratio",     "set ratio",        OFFSET(ratio),     AV_OPT_TYPE_DOUBLE, {.dbl=2},               1,   20, A|F },
-    { "attack",    "set attack",       OFFSET(attack),    AV_OPT_TYPE_DOUBLE, {.dbl=20},           0.01, 2000, A|F },
-    { "release",   "set release",      OFFSET(release),   AV_OPT_TYPE_DOUBLE, {.dbl=250},          0.01, 9000, A|F },
-    { "makeup",    "set make up gain", OFFSET(makeup),    AV_OPT_TYPE_DOUBLE, {.dbl=2},               1,   64, A|F },
-    { "knee",      "set knee",         OFFSET(knee),      AV_OPT_TYPE_DOUBLE, {.dbl=2.82843},         1,    8, A|F },
-    { "link",      "set link type",    OFFSET(link),      AV_OPT_TYPE_INT,    {.i64=0},               0,    1, A|F, "link" },
-    {   "average", 0,                  0,                 AV_OPT_TYPE_CONST,  {.i64=0},               0,    0, A|F, "link" },
-    {   "maximum", 0,                  0,                 AV_OPT_TYPE_CONST,  {.i64=1},               0,    0, A|F, "link" },
-    { "detection", "set detection",    OFFSET(detection), AV_OPT_TYPE_INT,    {.i64=1},               0,    1, A|F, "detection" },
-    {   "peak",    0,                  0,                 AV_OPT_TYPE_CONST,  {.i64=0},               0,    0, A|F, "detection" },
-    {   "rms",     0,                  0,                 AV_OPT_TYPE_CONST,  {.i64=1},               0,    0, A|F, "detection" },
-    { "mix",       "set mix",          OFFSET(mix),       AV_OPT_TYPE_DOUBLE, {.dbl=1},               0,    1, A|F },
+    { "level_in",  "set input gain",     OFFSET(level_in),  AV_OPT_TYPE_DOUBLE, {.dbl=1},        0.015625,   64, A|F },
+    { "threshold", "set threshold",      OFFSET(threshold), AV_OPT_TYPE_DOUBLE, {.dbl=0.125}, 0.000976563,    1, A|F },
+    { "ratio",     "set ratio",          OFFSET(ratio),     AV_OPT_TYPE_DOUBLE, {.dbl=2},               1,   20, A|F },
+    { "attack",    "set attack",         OFFSET(attack),    AV_OPT_TYPE_DOUBLE, {.dbl=20},           0.01, 2000, A|F },
+    { "release",   "set release",        OFFSET(release),   AV_OPT_TYPE_DOUBLE, {.dbl=250},          0.01, 9000, A|F },
+    { "makeup",    "set make up gain",   OFFSET(makeup),    AV_OPT_TYPE_DOUBLE, {.dbl=2},               1,   64, A|F },
+    { "knee",      "set knee",           OFFSET(knee),      AV_OPT_TYPE_DOUBLE, {.dbl=2.82843},         1,    8, A|F },
+    { "link",      "set link type",      OFFSET(link),      AV_OPT_TYPE_INT,    {.i64=0},               0,    1, A|F, "link" },
+    {   "average", 0,                    0,                 AV_OPT_TYPE_CONST,  {.i64=0},               0,    0, A|F, "link" },
+    {   "maximum", 0,                    0,                 AV_OPT_TYPE_CONST,  {.i64=1},               0,    0, A|F, "link" },
+    { "detection", "set detection",      OFFSET(detection), AV_OPT_TYPE_INT,    {.i64=1},               0,    1, A|F, "detection" },
+    {   "peak",    0,                    0,                 AV_OPT_TYPE_CONST,  {.i64=0},               0,    0, A|F, "detection" },
+    {   "rms",     0,                    0,                 AV_OPT_TYPE_CONST,  {.i64=1},               0,    0, A|F, "detection" },
+    { "level_sc",  "set sidechain gain", OFFSET(level_sc),  AV_OPT_TYPE_DOUBLE, {.dbl=1},        0.015625,   64, A|F },
+    { "mix",       "set mix",            OFFSET(mix),       AV_OPT_TYPE_DOUBLE, {.dbl=1},               0,    1, A|F },
     { NULL }
 };
 
 #define sidechaincompress_options options
 AVFILTER_DEFINE_CLASS(sidechaincompress);
 
-static av_cold int init(AVFilterContext *ctx)
-{
-    SidechainCompressContext *s = ctx->priv;
-
-    s->thres = log(s->threshold);
-    s->lin_knee_start = s->threshold / sqrt(s->knee);
-    s->knee_start = log(s->lin_knee_start);
-    s->knee_stop = log(s->threshold * sqrt(s->knee));
-    s->compressed_knee_stop = (s->knee_stop - s->thres) / s->ratio + s->thres;
-
-    return 0;
-}
-
 // A fake infinity value (because real infinity may break some hosts)
 #define FAKE_INFINITY (65536.0 * 65536.0)
 
@@ -132,6 +124,13 @@ static int compressor_config_output(AVFilterLink *outlink)
     AVFilterContext *ctx = outlink->src;
     SidechainCompressContext *s = ctx->priv;
 
+    s->thres = log(s->threshold);
+    s->lin_knee_start = s->threshold / sqrt(s->knee);
+    s->adj_knee_start = s->lin_knee_start * s->lin_knee_start;
+    s->knee_start = log(s->lin_knee_start);
+    s->knee_stop = log(s->threshold * sqrt(s->knee));
+    s->compressed_knee_stop = (s->knee_stop - s->thres) / s->ratio + s->thres;
+
     s->attack_coeff = FFMIN(1., 1. / (s->attack * outlink->sample_rate / 4000.));
     s->release_coeff = FFMIN(1., 1. / (s->release * outlink->sample_rate / 4000.));
 
@@ -139,7 +138,8 @@ static int compressor_config_output(AVFilterLink *outlink)
 }
 
 static void compressor(SidechainCompressContext *s,
-                       double *sample, const double *scsrc, int nb_samples,
+                       const double *src, double *dst, const double *scsrc, int nb_samples,
+                       double level_in, double level_sc,
                        AVFilterLink *inlink, AVFilterLink *sclink)
 {
     const double makeup = s->makeup;
@@ -149,14 +149,14 @@ static void compressor(SidechainCompressContext *s,
     for (i = 0; i < nb_samples; i++) {
         double abs_sample, gain = 1.0;
 
-        abs_sample = fabs(scsrc[0]);
+        abs_sample = fabs(scsrc[0] * level_sc);
 
         if (s->link == 1) {
             for (c = 1; c < sclink->channels; c++)
-                abs_sample = FFMAX(fabs(scsrc[c]), abs_sample);
+                abs_sample = FFMAX(fabs(scsrc[c] * level_sc), abs_sample);
         } else {
             for (c = 1; c < sclink->channels; c++)
-                abs_sample += fabs(scsrc[c]);
+                abs_sample += fabs(scsrc[c] * level_sc);
 
             abs_sample /= sclink->channels;
         }
@@ -166,15 +166,16 @@ static void compressor(SidechainCompressContext *s,
 
         s->lin_slope += (abs_sample - s->lin_slope) * (abs_sample > s->lin_slope ? s->attack_coeff : s->release_coeff);
 
-        if (s->lin_slope > 0.0 && s->lin_slope > s->lin_knee_start)
+        if (s->lin_slope > 0.0 && s->lin_slope > (s->detection ? s->adj_knee_start : s->lin_knee_start))
             gain = output_gain(s->lin_slope, s->ratio, s->thres, s->knee,
                                s->knee_start, s->knee_stop,
                                s->compressed_knee_stop, s->detection);
 
         for (c = 0; c < inlink->channels; c++)
-            sample[c] *= (gain * makeup * mix + (1. - mix));
+            dst[c] = src[c] * level_in * (gain * makeup * mix + (1. - mix));
 
-        sample += inlink->channels;
+        src += inlink->channels;
+        dst += inlink->channels;
         scsrc += sclink->channels;
     }
 }
@@ -205,7 +206,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame)
     sample = (double *)s->input_frame[0]->data[0];
     scsrc = (const double *)s->input_frame[1]->data[0];
 
-    compressor(s, sample, scsrc, nb_samples,
+    compressor(s, sample, sample, scsrc, nb_samples,
+               s->level_in, s->level_sc,
                ctx->inputs[0], ctx->inputs[1]);
     ret = ff_filter_frame(outlink, s->input_frame[0]);
 
@@ -324,7 +326,6 @@ AVFilter ff_af_sidechaincompress = {
     .description    = NULL_IF_CONFIG_SMALL("Sidechain compressor."),
     .priv_size      = sizeof(SidechainCompressContext),
     .priv_class     = &sidechaincompress_class,
-    .init           = init,
     .query_formats  = query_formats,
     .inputs         = sidechaincompress_inputs,
     .outputs        = sidechaincompress_outputs,
@@ -332,18 +333,34 @@ AVFilter ff_af_sidechaincompress = {
 #endif  /* CONFIG_SIDECHAINCOMPRESS_FILTER */
 
 #if CONFIG_ACOMPRESSOR_FILTER
-static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *frame)
+static int acompressor_filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
+    const double *src = (const double *)in->data[0];
     AVFilterContext *ctx = inlink->dst;
     SidechainCompressContext *s = ctx->priv;
     AVFilterLink *outlink = ctx->outputs[0];
-    double *sample;
+    AVFrame *out;
+    double *dst;
+
+    if (av_frame_is_writable(in)) {
+        out = in;
+    } else {
+        out = ff_get_audio_buffer(inlink, in->nb_samples);
+        if (!out) {
+            av_frame_free(&in);
+            return AVERROR(ENOMEM);
+        }
+        av_frame_copy_props(out, in);
+    }
+    dst = (double *)out->data[0];
 
-    sample = (double *)frame->data[0];
-    compressor(s, sample, sample, frame->nb_samples,
+    compressor(s, src, dst, src, in->nb_samples,
+               s->level_in, s->level_in,
                inlink, inlink);
 
-    return ff_filter_frame(outlink, frame);
+    if (out != in)
+        av_frame_free(&in);
+    return ff_filter_frame(outlink, out);
 }
 
 static int acompressor_query_formats(AVFilterContext *ctx)
@@ -384,7 +401,6 @@ static const AVFilterPad acompressor_inputs[] = {
         .name           = "default",
         .type           = AVMEDIA_TYPE_AUDIO,
         .filter_frame   = acompressor_filter_frame,
-        .needs_writable = 1,
     },
     { NULL }
 };
@@ -403,7 +419,6 @@ AVFilter ff_af_acompressor = {
     .description    = NULL_IF_CONFIG_SMALL("Audio compressor."),
     .priv_size      = sizeof(SidechainCompressContext),
     .priv_class     = &acompressor_class,
-    .init           = init,
     .query_formats  = acompressor_query_formats,
     .inputs         = acompressor_inputs,
     .outputs        = acompressor_outputs,