X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_anlmdn.c;h=8be73079bd8e3ea357131ae65dc7c05c125a97a4;hb=a04ad248a05e7b613abe09b3bb067f555108d794;hp=87c49c63b1c6a7db379efcf8fbe7ac85b21a1411;hpb=d6b62ce1aced9e2456582870382f384581cc7cbb;p=ffmpeg

diff --git a/libavfilter/af_anlmdn.c b/libavfilter/af_anlmdn.c
index 87c49c63b1c..8be73079bd8 100644
--- a/libavfilter/af_anlmdn.c
+++ b/libavfilter/af_anlmdn.c
@@ -22,6 +22,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/audio_fifo.h"
+#include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "audio.h"
@@ -29,7 +30,6 @@
 
 #include "af_anlmdndsp.h"
 
-#define MAX_DIFF         11.f
 #define WEIGHT_LUT_NBITS 20
 #define WEIGHT_LUT_SIZE  (1<<WEIGHT_LUT_NBITS)
 
@@ -41,6 +41,7 @@ typedef struct AudioNLMeansContext {
     float a;
     int64_t pd;
     int64_t rd;
+    float m;
     int om;
 
     float pdiff_lut_scale;
@@ -71,16 +72,17 @@ enum OutModes {
 };
 
 #define OFFSET(x) offsetof(AudioNLMeansContext, x)
-#define AF AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
+#define AFT AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
 
 static const AVOption anlmdn_options[] = {
-    { "s", "set denoising strength", OFFSET(a),  AV_OPT_TYPE_FLOAT,    {.dbl=0.00001},0.00001, 10, AF },
-    { "p", "set patch duration",     OFFSET(pd), AV_OPT_TYPE_DURATION, {.i64=2000}, 1000, 100000, AF },
-    { "r", "set research duration",  OFFSET(rd), AV_OPT_TYPE_DURATION, {.i64=6000}, 2000, 300000, AF },
-    { "o", "set output mode",        OFFSET(om), AV_OPT_TYPE_INT,      {.i64=OUT_MODE},  0, NB_MODES-1, AF, "mode" },
-    {  "i", "input",                 0,          AV_OPT_TYPE_CONST,    {.i64=IN_MODE},   0,  0, AF, "mode" },
-    {  "o", "output",                0,          AV_OPT_TYPE_CONST,    {.i64=OUT_MODE},  0,  0, AF, "mode" },
-    {  "n", "noise",                 0,          AV_OPT_TYPE_CONST,    {.i64=NOISE_MODE},0,  0, AF, "mode" },
+    { "s", "set denoising strength", OFFSET(a),  AV_OPT_TYPE_FLOAT,    {.dbl=0.00001},0.00001, 10, AFT },
+    { "p", "set patch duration",     OFFSET(pd), AV_OPT_TYPE_DURATION, {.i64=2000}, 1000, 100000, AFT },
+    { "r", "set research duration",  OFFSET(rd), AV_OPT_TYPE_DURATION, {.i64=6000}, 2000, 300000, AFT },
+    { "o", "set output mode",        OFFSET(om), AV_OPT_TYPE_INT,      {.i64=OUT_MODE},  0, NB_MODES-1, AFT, "mode" },
+    {  "i", "input",                 0,          AV_OPT_TYPE_CONST,    {.i64=IN_MODE},   0,  0, AFT, "mode" },
+    {  "o", "output",                0,          AV_OPT_TYPE_CONST,    {.i64=OUT_MODE},  0,  0, AFT, "mode" },
+    {  "n", "noise",                 0,          AV_OPT_TYPE_CONST,    {.i64=NOISE_MODE},0,  0, AFT, "mode" },
+    { "m", "set smooth factor",      OFFSET(m),  AV_OPT_TYPE_FLOAT,    {.dbl=11.},       1, 15, AFT },
     { NULL }
 };
 
@@ -144,32 +146,73 @@ void ff_anlmdn_init(AudioNLMDNDSPContext *dsp)
         ff_anlmdn_init_x86(dsp);
 }
 
-static int config_output(AVFilterLink *outlink)
+static int config_filter(AVFilterContext *ctx)
 {
-    AVFilterContext *ctx = outlink->src;
     AudioNLMeansContext *s = ctx->priv;
-    int ret;
+    AVFilterLink *outlink = ctx->outputs[0];
+    int newK, newS, newH, newN;
+    AVFrame *new_in, *new_cache;
 
-    s->K = av_rescale(s->pd, outlink->sample_rate, AV_TIME_BASE);
-    s->S = av_rescale(s->rd, outlink->sample_rate, AV_TIME_BASE);
+    newK = av_rescale(s->pd, outlink->sample_rate, AV_TIME_BASE);
+    newS = av_rescale(s->rd, outlink->sample_rate, AV_TIME_BASE);
 
-    s->eof_left = -1;
-    s->pts = AV_NOPTS_VALUE;
-    s->H = s->K * 2 + 1;
-    s->N = s->H + (s->K + s->S) * 2;
+    newH = newK * 2 + 1;
+    newN = newH + (newK + newS) * 2;
 
-    av_log(ctx, AV_LOG_DEBUG, "K:%d S:%d H:%d N:%d\n", s->K, s->S, s->H, s->N);
+    av_log(ctx, AV_LOG_DEBUG, "K:%d S:%d H:%d N:%d\n", newK, newS, newH, newN);
 
-    av_frame_free(&s->in);
-    av_frame_free(&s->cache);
-    s->in = ff_get_audio_buffer(outlink, s->N);
-    if (!s->in)
+    if (!s->cache || s->cache->nb_samples < newS * 2) {
+        new_cache = ff_get_audio_buffer(outlink, newS * 2);
+        if (new_cache) {
+            av_frame_free(&s->cache);
+            s->cache = new_cache;
+        } else {
+            return AVERROR(ENOMEM);
+        }
+    }
+    if (!s->cache)
         return AVERROR(ENOMEM);
 
-    s->cache = ff_get_audio_buffer(outlink, s->S * 2);
-    if (!s->cache)
+    s->pdiff_lut_scale = 1.f / s->m * WEIGHT_LUT_SIZE;
+    for (int i = 0; i < WEIGHT_LUT_SIZE; i++) {
+        float w = -i / s->pdiff_lut_scale;
+
+        s->weight_lut[i] = expf(w);
+    }
+
+    if (!s->in || s->in->nb_samples < newN) {
+        new_in = ff_get_audio_buffer(outlink, newN);
+        if (new_in) {
+            av_frame_free(&s->in);
+            s->in = new_in;
+        } else {
+            return AVERROR(ENOMEM);
+        }
+    }
+    if (!s->in)
         return AVERROR(ENOMEM);
 
+    s->K = newK;
+    s->S = newS;
+    s->H = newH;
+    s->N = newN;
+
+    return 0;
+}
+
+static int config_output(AVFilterLink *outlink)
+{
+    AVFilterContext *ctx = outlink->src;
+    AudioNLMeansContext *s = ctx->priv;
+    int ret;
+
+    s->eof_left = -1;
+    s->pts = AV_NOPTS_VALUE;
+
+    ret = config_filter(ctx);
+    if (ret < 0)
+        return ret;
+
     s->fifo = av_audio_fifo_alloc(outlink->format, outlink->channels, s->N);
     if (!s->fifo)
         return AVERROR(ENOMEM);
@@ -178,13 +221,6 @@ static int config_output(AVFilterLink *outlink)
     if (ret < 0)
         return ret;
 
-    s->pdiff_lut_scale = 1.f / MAX_DIFF * WEIGHT_LUT_SIZE;
-    for (int i = 0; i < WEIGHT_LUT_SIZE; i++) {
-        float w = -i / s->pdiff_lut_scale;
-
-        s->weight_lut[i] = expf(w);
-    }
-
     ff_anlmdn_init(&s->dsp);
 
     return 0;
@@ -201,6 +237,7 @@ static int filter_channel(AVFilterContext *ctx, void *arg, int ch, int nb_jobs)
     float *cache = (float *)s->cache->extended_data[ch];
     const float sw = (65536.f / (4 * K + 2)) / sqrtf(s->a);
     float *dst = (float *)out->extended_data[ch] + s->offset;
+    const float smooth = s->m;
 
     for (int i = S; i < s->H + S; i++) {
         float P = 0.f, Q = 0.f;
@@ -222,9 +259,12 @@ static int filter_channel(AVFilterContext *ctx, void *arg, int ch, int nb_jobs)
             unsigned weight_lut_idx;
             float w;
 
-            av_assert2(distance >= 0.f);
+            if (distance < 0.f) {
+                cache[j] = 0.f;
+                continue;
+            }
             w = distance * sw;
-            if (w >= MAX_DIFF)
+            if (w >= smooth)
                 continue;
             weight_lut_idx = w * s->pdiff_lut_scale;
             av_assert2(weight_lut_idx < WEIGHT_LUT_SIZE);
@@ -291,7 +331,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
             out->nb_samples = FFMIN(s->eof_left, s->offset);
             s->eof_left -= out->nb_samples;
         }
-        s->pts += s->offset;
+        s->pts += av_rescale_q(s->offset, (AVRational){1, outlink->sample_rate}, outlink->time_base);
 
         return ff_filter_frame(outlink, out);
     }
@@ -312,7 +352,7 @@ static int request_frame(AVFilterLink *outlink)
 
         if (s->eof_left < 0)
             s->eof_left = av_audio_fifo_size(s->fifo) - (s->S + s->K);
-        if (s->eof_left < 0)
+        if (s->eof_left <= 0)
             return AVERROR_EOF;
         in = ff_get_audio_buffer(outlink, s->H);
         if (!in)
@@ -324,6 +364,22 @@ static int request_frame(AVFilterLink *outlink)
     return ret;
 }
 
+static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,
+                           char *res, int res_len, int flags)
+{
+    int ret;
+
+    ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags);
+    if (ret < 0)
+        return ret;
+
+    ret = config_filter(ctx);
+    if (ret < 0)
+        return ret;
+
+    return 0;
+}
+
 static av_cold void uninit(AVFilterContext *ctx)
 {
     AudioNLMeansContext *s = ctx->priv;
@@ -352,7 +408,7 @@ static const AVFilterPad outputs[] = {
     { NULL }
 };
 
-AVFilter ff_af_anlmdn = {
+const AVFilter ff_af_anlmdn = {
     .name          = "anlmdn",
     .description   = NULL_IF_CONFIG_SMALL("Reduce broadband noise from stream using Non-Local Means."),
     .query_formats = query_formats,
@@ -361,6 +417,7 @@ AVFilter ff_af_anlmdn = {
     .uninit        = uninit,
     .inputs        = inputs,
     .outputs       = outputs,
+    .process_command = process_command,
     .flags         = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL |
                      AVFILTER_FLAG_SLICE_THREADS,
 };