avfilter/af_crossfeed: make slope configurable

diff --git a/doc/filters.texi b/doc/filters.texi
index be224bd5b9cdbb91e30d258d5fd323fc28441473..8ff32f49bf341bec27307286c1e512325d32c8bb 100644 (file)
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3267,6 +3267,10 @@ Set soundstage wideness. Default is 0.5. Allowed range is from 0 to 1.
 This sets cut off frequency of low shelf filter. Default is cut off near
 1550 Hz. With range set to 1 cut off frequency is set to 2100 Hz.
 
+@item slope
+Set curve slope of low shelf filter. Default is 0.5.
+Allowed range is from 0.01 to 1.
+
 @item level_in
 Set input gain. Default is 0.9.
 

diff --git a/libavfilter/af_crossfeed.c b/libavfilter/af_crossfeed.c
index f1bbb357ba58e7a8b290998368bdc8b63e24acde..cc2db70e628f0fae3fab8c40be9d2b85b9c0d7f4 100644 (file)
--- a/libavfilter/af_crossfeed.c
+++ b/libavfilter/af_crossfeed.c
@@ -28,6 +28,7 @@ typedef struct CrossfeedContext {
 
     double range;
     double strength;
+    double slope;
     double level_in;
     double level_out;
 
@@ -62,7 +63,7 @@ static int config_input(AVFilterLink *inlink)
     double w0 = 2 * M_PI * (1. - s->range) * 2100 / inlink->sample_rate;
     double alpha;
 
-    alpha = sin(w0) / 2 * sqrt((A + 1 / A) * (1 / 0.5 - 1) + 2);
+    alpha = sin(w0) / 2 * sqrt((A + 1 / A) * (1 / s->slope - 1) + 2);
 
     s->a0 =          (A + 1) + (A - 1) * cos(w0) + 2 * sqrt(A) * alpha;
     s->a1 =    -2 * ((A - 1) + (A + 1) * cos(w0));
@@ -139,6 +140,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 static const AVOption crossfeed_options[] = {
     { "strength",  "set crossfeed strength",  OFFSET(strength),  AV_OPT_TYPE_DOUBLE, {.dbl=.2}, 0, 1, FLAGS },
     { "range",     "set soundstage wideness", OFFSET(range),     AV_OPT_TYPE_DOUBLE, {.dbl=.5}, 0, 1, FLAGS },
+    { "slope",     "set curve slope",         OFFSET(slope),     AV_OPT_TYPE_DOUBLE, {.dbl=.5}, .01, 1, FLAGS },
     { "level_in",  "set level in",            OFFSET(level_in),  AV_OPT_TYPE_DOUBLE, {.dbl=.9}, 0, 1, FLAGS },
     { "level_out", "set level out",           OFFSET(level_out), AV_OPT_TYPE_DOUBLE, {.dbl=1.}, 0, 1, FLAGS },
     { NULL }