avfilter/asubprocess: get rid of config_input

Signed-off-by: Stefan Westerfeld <stefan@space.twc.de>

libavfilter/af_asubprocess.c

@@ -46,6 +46,7 @@ typedef struct SP
 } SP;
 
 enum {
+    STATE_START = 0,
     STATE_EXPECT_RIFF,
     STATE_EXPECT_CHUNK,
     STATE_SKIP_CHUNK,
@@ -54,7 +55,7 @@ enum {
     STATE_ERROR
 };
 
-typedef struct AndioWMarkContext {
+typedef struct ASubProcessContext {
     const AVClass *class;
 
     const char   *command;
@@ -433,33 +434,6 @@ static int write_wav_header(AVFilterContext *ctx, ASubProcessContext *s, int nb_
     return ret;
 }
 
-static int config_input(AVFilterLink *inlink)
-{
-    AVFilterContext *ctx = inlink->dst;
-    ASubProcessContext *s = ctx->priv;
-    int ret;
-
-    ret = sp_new(ctx);
-    if (ret != 0)
-        return ret;
-
-    ret = write_wav_header(ctx, s, inlink->ch_layout.nb_channels, inlink->sample_rate);
-    if (ret != 0)
-        return ret;
-
-#if 0
-    if (s->rbs)
-        rubberband_delete(s->rbs);
-    s->rbs = rubberband_new(inlink->sample_rate, inlink->ch_layout.nb_channels, opts, 1. / s->tempo, s->pitch);
-    if (!s->rbs)
-        return AVERROR(ENOMEM);
-
-    s->first_pts = AV_NOPTS_VALUE;
-#endif
-    s->state = STATE_EXPECT_RIFF;
-    return 0;
-}
-
 static void read_samples(ASubProcessContext *s, int32_t *data, int count)
 {
     int sample_size = s->out_bit_depth / 8;
@@ -588,6 +562,18 @@ static int activate(AVFilterContext *ctx)
     int64_t pts;
     int status, ret;
 
+    if (s->state == STATE_START) {
+        ret = sp_new(ctx);
+        if (ret != 0)
+            return ret;
+
+        s->state = STATE_EXPECT_RIFF;
+
+        ret = write_wav_header(ctx, s, inlink->ch_layout.nb_channels, inlink->sample_rate);
+        if (ret != 0)
+            return ret;
+    }
+
     FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
 
     ret = try_read_frame(ctx);
@@ -635,14 +621,6 @@ static int activate(AVFilterContext *ctx)
     return FFERROR_NOT_READY;
 }
 
-static const AVFilterPad asubprocess_inputs[] = {
-    {
-        .name          = "default",
-        .type          = AVMEDIA_TYPE_AUDIO,
-        .config_props  = config_input,
-    },
-};
-
 const AVFilter ff_af_asubprocess = {
     .name          = "asubprocess",
     .description   = NULL_IF_CONFIG_SMALL("Filter audio stream with subprocess."),
@@ -651,7 +629,7 @@ const AVFilter ff_af_asubprocess = {
     .init          = init,
     .uninit        = uninit,
     .activate      = activate,
-    FILTER_INPUTS(asubprocess_inputs),
+    FILTER_INPUTS(ff_audio_default_filterpad),
     FILTER_OUTPUTS(ff_audio_default_filterpad),
     FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_S32),
 };