X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_crystalizer.c;h=f3d8ae69918f4991697ade51cf8c3197ba2d402d;hb=60e7021064ea9e99854c585d452e89f38635480e;hp=5b27e1fb797dba29fa97fa5a36170c8377e8e49b;hpb=409e684e79b6ee0c511292326f09b13fe230e58e;p=ffmpeg

diff --git a/libavfilter/af_crystalizer.c b/libavfilter/af_crystalizer.c
index 5b27e1fb797..f3d8ae69918 100644
--- a/libavfilter/af_crystalizer.c
+++ b/libavfilter/af_crystalizer.c
@@ -29,12 +29,11 @@ typedef struct CrystalizerContext {
     float mult;
     int clip;
     AVFrame *prev;
-    void (*filter)(void **dst, void **prv, const void **src,
-                   int nb_samples, int channels, float mult, int clip);
+    int (*filter)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
 } CrystalizerContext;
 
 #define OFFSET(x) offsetof(CrystalizerContext, x)
-#define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
+#define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
 
 static const AVOption crystalizer_options[] = {
     { "i", "set intensity",    OFFSET(mult), AV_OPT_TYPE_FLOAT, {.dbl=2.0}, 0, 10, A },
@@ -74,42 +73,71 @@ static int query_formats(AVFilterContext *ctx)
     return ff_set_common_samplerates(ctx, formats);
 }
 
-static void filter_flt(void **d, void **p, const void **s,
-                       int nb_samples, int channels,
-                       float mult, int clip)
+typedef struct ThreadData {
+    void **d;
+    void **p;
+    const void **s;
+    int nb_samples;
+    int channels;
+    float mult;
+    int clip;
+} ThreadData;
+
+static int filter_flt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
 {
-    const float *src = s[0];
-    float *dst = d[0];
+    ThreadData *td = arg;
+    void **d = td->d;
+    void **p = td->p;
+    const void **s = td->s;
+    const int nb_samples = td->nb_samples;
+    const int channels = td->channels;
+    float mult = td->mult;
+    const int clip = td->clip;
+    const int start = (channels * jobnr) / nb_jobs;
+    const int end = (channels * (jobnr+1)) / nb_jobs;
     float *prv = p[0];
     int n, c;
 
-    for (n = 0; n < nb_samples; n++) {
-        for (c = 0; c < channels; c++) {
-            float current = src[c];
+    for (c = start; c < end; c++) {
+        const float *src = s[0];
+        float *dst = d[0];
 
+        for (n = 0; n < nb_samples; n++) {
+            float current = src[c];
             dst[c] = current + (current - prv[c]) * mult;
             prv[c] = current;
             if (clip) {
                 dst[c] = av_clipf(dst[c], -1, 1);
             }
-        }
 
-        dst += c;
-        src += c;
+            dst += channels;
+            src += channels;
+        }
     }
+
+    return 0;
 }
 
-static void filter_dbl(void **d, void **p, const void **s,
-                       int nb_samples, int channels,
-                       float mult, int clip)
+static int filter_dbl(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
 {
-    const double *src = s[0];
-    double *dst = d[0];
+    ThreadData *td = arg;
+    void **d = td->d;
+    void **p = td->p;
+    const void **s = td->s;
+    const int nb_samples = td->nb_samples;
+    const int channels = td->channels;
+    float mult = td->mult;
+    const int clip = td->clip;
+    const int start = (channels * jobnr) / nb_jobs;
+    const int end = (channels * (jobnr+1)) / nb_jobs;
     double *prv = p[0];
     int n, c;
 
-    for (n = 0; n < nb_samples; n++) {
-        for (c = 0; c < channels; c++) {
+    for (c = start; c < end; c++) {
+        const double *src = s[0];
+        double *dst = d[0];
+
+        for (n = 0; n < nb_samples; n++) {
             double current = src[c];
 
             dst[c] = current + (current - prv[c]) * mult;
@@ -117,20 +145,30 @@ static void filter_dbl(void **d, void **p, const void **s,
             if (clip) {
                 dst[c] = av_clipd(dst[c], -1, 1);
             }
-        }
 
-        dst += c;
-        src += c;
+            dst += channels;
+            src += channels;
+        }
     }
+
+    return 0;
 }
 
-static void filter_fltp(void **d, void **p, const void **s,
-                        int nb_samples, int channels,
-                        float mult, int clip)
+static int filter_fltp(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
 {
+    ThreadData *td = arg;
+    void **d = td->d;
+    void **p = td->p;
+    const void **s = td->s;
+    const int nb_samples = td->nb_samples;
+    const int channels = td->channels;
+    float mult = td->mult;
+    const int clip = td->clip;
+    const int start = (channels * jobnr) / nb_jobs;
+    const int end = (channels * (jobnr+1)) / nb_jobs;
     int n, c;
 
-    for (c = 0; c < channels; c++) {
+    for (c = start; c < end; c++) {
         const float *src = s[c];
         float *dst = d[c];
         float *prv = p[c];
@@ -145,15 +183,25 @@ static void filter_fltp(void **d, void **p, const void **s,
             }
         }
     }
+
+    return 0;
 }
 
-static void filter_dblp(void **d, void **p, const void **s,
-                        int nb_samples, int channels,
-                        float mult, int clip)
+static int filter_dblp(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
 {
+    ThreadData *td = arg;
+    void **d = td->d;
+    void **p = td->p;
+    const void **s = td->s;
+    const int nb_samples = td->nb_samples;
+    const int channels = td->channels;
+    float mult = td->mult;
+    const int clip = td->clip;
+    const int start = (channels * jobnr) / nb_jobs;
+    const int end = (channels * (jobnr+1)) / nb_jobs;
     int n, c;
 
-    for (c = 0; c < channels; c++) {
+    for (c = start; c < end; c++) {
         const double *src = s[c];
         double *dst = d[c];
         double *prv = p[c];
@@ -168,6 +216,8 @@ static void filter_dblp(void **d, void **p, const void **s,
             }
         }
     }
+
+    return 0;
 }
 
 static int config_input(AVFilterLink *inlink)
@@ -191,6 +241,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     AVFilterLink *outlink = ctx->outputs[0];
     CrystalizerContext *s = ctx->priv;
     AVFrame *out;
+    ThreadData td;
 
     if (!s->prev) {
         s->prev = ff_get_audio_buffer(inlink, 1);
@@ -211,8 +262,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
         av_frame_copy_props(out, in);
     }
 
-    s->filter((void **)out->extended_data, (void **)s->prev->extended_data, (const void **)in->extended_data,
-              in->nb_samples, in->channels, s->mult, s->clip);
+    td.d = (void **)out->extended_data;
+    td.s = (const void **)in->extended_data;
+    td.p = (void **)s->prev->extended_data;
+    td.nb_samples = in->nb_samples;
+    td.channels = in->channels;
+    td.mult = ctx->is_disabled ? 0.f : s->mult;
+    td.clip = s->clip;
+    ctx->internal->execute(ctx, s->filter, &td, NULL, FFMIN(inlink->channels,
+                                                            ff_filter_get_nb_threads(ctx)));
 
     if (out != in)
         av_frame_free(&in);
@@ -254,4 +312,7 @@ AVFilter ff_af_crystalizer = {
     .uninit         = uninit,
     .inputs         = inputs,
     .outputs        = outputs,
+    .process_command = ff_filter_process_command,
+    .flags          = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL |
+                      AVFILTER_FLAG_SLICE_THREADS,
 };