vf_deinterlace_vaapi: Create filter buffer after context

[ffmpeg] / libavfilter / graphparser.c

diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index d48828ea24a5517eb61f5e65e981dc1822d15d85..da499b52c93aa2b7e239af59d04154d3ac92018b 100644 (file)
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -26,7 +26,6 @@
 #include "libavutil/avstring.h"
 #include "libavutil/mem.h"
 #include "avfilter.h"
-#include "avfiltergraph.h"
 
 #define WHITESPACES " \n\t"
 
@@ -63,6 +62,8 @@ static char *parse_link_name(const char **buf, void *log_ctx)
     (*buf)++;
 
     name = av_get_token(buf, "]");
+    if (!name)
+        goto fail;
 
     if (!name[0]) {
         av_log(log_ctx, AV_LOG_ERROR,
@@ -80,6 +81,41 @@ static char *parse_link_name(const char **buf, void *log_ctx)
     return name;
 }
 
+#define TMP_ARGS_SIZE 256
+
+static void append_sws_flags(const char **args, const char *sws_opts, char *tmp)
+{
+    int nb_opts = 0;
+    const char *separator  = ":";
+    const char *opt        = *args;
+
+    if (strstr(*args, "flags"))
+        return;
+
+    if (strstr(*args, "="))
+        separator = ":flags=";
+
+    while ((opt = strstr(opt, ":")) && *opt) {
+        av_log(NULL, AV_LOG_INFO, "opts '%s' \n", opt);
+        if (nb_opts > 2) {
+            return;
+        }
+        nb_opts++;
+        opt++;
+    }
+
+    opt = strstr(sws_opts, "flags=");
+    if (opt && strlen(opt) > 6)
+        opt += 6;
+    else
+        opt = sws_opts;
+
+    snprintf(tmp, TMP_ARGS_SIZE, "%s%s%s",
+             *args, separator, opt);
+
+    *args = tmp;
+}
+
 /**
  * Create an instance of a filter, initialize and insert it in the
  * filtergraph in *ctx.
@@ -97,7 +133,7 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind
 {
     AVFilter *filt;
     char inst_name[30];
-    char tmp_args[256];
+    char tmp_args[TMP_ARGS_SIZE];
     int ret;
 
     snprintf(inst_name, sizeof(inst_name), "Parsed filter %d %s", index, filt_name);
@@ -110,27 +146,26 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind
         return AVERROR(EINVAL);
     }
 
-    ret = avfilter_open(filt_ctx, filt, inst_name);
+    *filt_ctx = avfilter_graph_alloc_filter(ctx, filt, inst_name);
     if (!*filt_ctx) {
         av_log(log_ctx, AV_LOG_ERROR,
                "Error creating filter '%s'\n", filt_name);
-        return ret;
-    }
-
-    if ((ret = avfilter_graph_add_filter(ctx, *filt_ctx)) < 0) {
-        avfilter_free(*filt_ctx);
-        return ret;
+        return AVERROR(ENOMEM);
     }
 
-    if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags")) {
-        snprintf(tmp_args, sizeof(tmp_args), "%s:%s",
-                 args, ctx->scale_sws_opts);
-        args = tmp_args;
+    if (!strcmp(filt_name, "scale") && args &&
+        ctx->scale_sws_opts) {
+        append_sws_flags(&args, ctx->scale_sws_opts, tmp_args);
     }
 
-    if ((ret = avfilter_init_filter(*filt_ctx, args, NULL)) < 0) {
+    ret = avfilter_init_str(*filt_ctx, args);
+    if (ret < 0) {
         av_log(log_ctx, AV_LOG_ERROR,
-               "Error initializing filter '%s' with args '%s'\n", filt_name, args);
+               "Error initializing filter '%s'", filt_name);
+        if (args)
+            av_log(log_ctx, AV_LOG_ERROR, " with args '%s'", args);
+        av_log(log_ctx, AV_LOG_ERROR, "\n");
+        avfilter_free(*filt_ctx);
         return ret;
     }
 
@@ -435,8 +470,8 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
     return 0;
 
  fail:
-    for (; graph->filter_count > 0; graph->filter_count--)
-        avfilter_free(graph->filters[graph->filter_count - 1]);
+    while (graph->nb_filters)
+        avfilter_free(graph->filters[0]);
     av_freep(&graph->filters);
     avfilter_inout_free(&open_inputs);
     avfilter_inout_free(&open_outputs);
@@ -500,8 +535,8 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
 
  fail:
     if (ret < 0) {
-        for (; graph->filter_count > 0; graph->filter_count--)
-            avfilter_free(graph->filters[graph->filter_count - 1]);
+        while (graph->nb_filters)
+            avfilter_free(graph->filters[0]);
         av_freep(&graph->filters);
     }
     avfilter_inout_free(&inputs);