X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_rubberband.c;h=bfacbcd245ff8929560d96d3f4c79239ff752d90;hb=a04ad248a05e7b613abe09b3bb067f555108d794;hp=10471bc94d2fb2bc7e8b8e147de1fdca751b7282;hpb=67d466d09b105b2b1d3d8da4c21d8975925741ae;p=ffmpeg

diff --git a/libavfilter/af_rubberband.c b/libavfilter/af_rubberband.c
index 10471bc94d2..bfacbcd245f 100644
--- a/libavfilter/af_rubberband.c
+++ b/libavfilter/af_rubberband.c
@@ -43,10 +43,11 @@ typedef struct RubberBandContext {
 
 #define OFFSET(x) offsetof(RubberBandContext, x)
 #define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
+#define AT AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM
 
 static const AVOption rubberband_options[] = {
-    { "tempo",      "set tempo scale factor", OFFSET(tempo), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, A },
-    { "pitch",      "set pitch scale factor", OFFSET(pitch), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, A },
+    { "tempo",      "set tempo scale factor", OFFSET(tempo), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, AT },
+    { "pitch",      "set pitch scale factor", OFFSET(pitch), AV_OPT_TYPE_DOUBLE, {.dbl=1}, 0.01, 100, AT },
     { "transients", "set transients", OFFSET(transients), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, A, "transients" },
         { "crisp",  0,                0,                  AV_OPT_TYPE_CONST, {.i64=RubberBandOptionTransientsCrisp},  0, 0, A, "transients" },
         { "mixed",  0,                0,                  AV_OPT_TYPE_CONST, {.i64=RubberBandOptionTransientsMixed},  0, 0, A, "transients" },
@@ -120,8 +121,9 @@ static int query_formats(AVFilterContext *ctx)
 
 static int filter_frame(AVFilterLink *inlink, AVFrame *in)
 {
-    RubberBandContext *s = inlink->dst->priv;
-    AVFilterLink *outlink = inlink->dst->outputs[0];
+    AVFilterContext *ctx = inlink->dst;
+    RubberBandContext *s = ctx->priv;
+    AVFilterLink *outlink = ctx->outputs[0];
     AVFrame *out;
     int ret = 0, nb_samples;
 
@@ -148,7 +150,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     }
 
     av_frame_free(&in);
-    return ret;
+    if (ff_inlink_queued_samples(inlink) >= s->nb_samples)
+        ff_filter_set_ready(ctx, 100);
+    return ret < 0 ? ret : nb_samples;
 }
 
 static int config_input(AVFilterLink *inlink)
@@ -184,8 +188,11 @@ static int activate(AVFilterContext *ctx)
     ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
     if (ret < 0)
         return ret;
-    if (ret > 0)
-        return filter_frame(inlink, in);
+    if (ret > 0) {
+        ret = filter_frame(inlink, in);
+        if (ret != 0)
+            return ret;
+    }
 
     FF_FILTER_FORWARD_STATUS(inlink, outlink);
     FF_FILTER_FORWARD_WANTED(outlink, inlink);
@@ -197,30 +204,15 @@ static int process_command(AVFilterContext *ctx, const char *cmd, const char *ar
                            char *res, int res_len, int flags)
 {
     RubberBandContext *s = ctx->priv;
+    int ret;
 
-    if (!strcmp(cmd, "tempo")) {
-        double arg;
-
-        sscanf(args, "%lf", &arg);
-        if (arg < 0.01 || arg > 100) {
-            av_log(ctx, AV_LOG_ERROR,
-                   "Tempo scale factor '%f' out of range\n", arg);
-            return AVERROR(EINVAL);
-        }
-        rubberband_set_time_ratio(s->rbs, 1. / arg);
-    }
-
-    if (!strcmp(cmd, "pitch")) {
-        double arg;
+    ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags);
+    if (ret < 0)
+        return ret;
 
-        sscanf(args, "%lf", &arg);
-        if (arg < 0.01 || arg > 100) {
-            av_log(ctx, AV_LOG_ERROR,
-                   "Pitch scale factor '%f' out of range\n", arg);
-            return AVERROR(EINVAL);
-        }
-        rubberband_set_pitch_scale(s->rbs, arg);
-    }
+    rubberband_set_time_ratio(s->rbs, 1. / s->tempo);
+    rubberband_set_pitch_scale(s->rbs, s->pitch);
+    s->nb_samples = rubberband_get_samples_required(s->rbs);
 
     return 0;
 }
@@ -242,7 +234,7 @@ static const AVFilterPad rubberband_outputs[] = {
     { NULL }
 };
 
-AVFilter ff_af_rubberband = {
+const AVFilter ff_af_rubberband = {
     .name          = "rubberband",
     .description   = NULL_IF_CONFIG_SMALL("Apply time-stretching and pitch-shifting."),
     .query_formats = query_formats,