Remove FF_MM_SSE2/3 flags for CPUs where this is generally not faster than
[ffmpeg.git] / libavfilter / graphparser.c
index bdcf367..46d7676 100644 (file)
@@ -26,6 +26,9 @@
 #include "graphparser.h"
 #include "avfilter.h"
 #include "avfiltergraph.h"
+#include "parseutils.h"
+
+#define WHITESPACES " \n\t"
 
 static int link_filter(AVFilterContext *src, int srcpad,
                        AVFilterContext *dst, int dstpad,
@@ -41,54 +44,6 @@ static int link_filter(AVFilterContext *src, int srcpad,
     return 0;
 }
 
-static int consume_whitespace(const char *buf)
-{
-    return strspn(buf, " \n\t");
-}
-
-/**
- * Consumes a string from *buf.
- * @return a copy of the consumed string, which should be free'd after use
- */
-static char *consume_string(const char **buf)
-{
-    char *out = av_malloc(strlen(*buf) + 1);
-    char *ret = out;
-
-    *buf += consume_whitespace(*buf);
-
-    do{
-        char c = *(*buf)++;
-        switch (c) {
-        case '\\':
-            *out++ = *(*buf)++;
-            break;
-        case '\'':
-            while(**buf && **buf != '\'')
-                *out++ = *(*buf)++;
-            if(**buf) (*buf)++;
-            break;
-        case 0:
-        case ']':
-        case '[':
-        case '=':
-        case ',':
-        case ';':
-        case ' ':
-        case '\n':
-            *out++ = 0;
-            break;
-        default:
-            *out++ = c;
-        }
-    } while(out[-1]);
-
-    (*buf)--;
-    *buf += consume_whitespace(*buf);
-
-    return ret;
-}
-
 /**
  * Parse "[linkname]"
  * @param name a pointer (that need to be free'd after use) to the name between
@@ -100,7 +55,7 @@ static char *parse_link_name(const char **buf, AVClass *log_ctx)
     char *name;
     (*buf)++;
 
-    name = consume_string(buf);
+    name = av_get_token(buf, "]");
 
     if(!name[0]) {
         av_log(log_ctx, AV_LOG_ERROR,
@@ -119,41 +74,50 @@ static char *parse_link_name(const char **buf, AVClass *log_ctx)
 }
 
 static AVFilterContext *create_filter(AVFilterGraph *ctx, int index,
-                                      const char *name, const char *args,
+                                      const char *filt_name, const char *args,
                                       AVClass *log_ctx)
 {
-    AVFilterContext *filt;
+    AVFilterContext *filt_ctx;
 
-    AVFilter *filterdef;
+    AVFilter *filt;
     char inst_name[30];
+    char tmp_args[256];
 
-    snprintf(inst_name, sizeof(inst_name), "Parsed filter %d", index);
+    snprintf(inst_name, sizeof(inst_name), "Filter %d %s", index, filt_name);
 
-    filterdef = avfilter_get_by_name(name);
+    filt = avfilter_get_by_name(filt_name);
 
-    if(!filterdef) {
+    if(!filt) {
         av_log(log_ctx, AV_LOG_ERROR,
-               "no such filter: '%s'\n", name);
+               "no such filter: '%s'\n", filt_name);
         return NULL;
     }
 
-    filt = avfilter_open(filterdef, inst_name);
-    if(!filt) {
+    filt_ctx = avfilter_open(filt, inst_name);
+    if(!filt_ctx) {
         av_log(log_ctx, AV_LOG_ERROR,
-               "error creating filter '%s'\n", name);
+               "error creating filter '%s'\n", filt_name);
         return NULL;
     }
 
-    if(avfilter_graph_add_filter(ctx, filt) < 0)
+    if(avfilter_graph_add_filter(ctx, filt_ctx) < 0) {
+        avfilter_destroy(filt_ctx);
         return NULL;
+    }
+
+    if (!strcmp(filt_name, "scale") && !strstr(args, "flags")) {
+        snprintf(tmp_args, sizeof(tmp_args), "%s:%s",
+                 args, ctx->scale_sws_opts);
+        args = tmp_args;
+    }
 
-    if(avfilter_init_filter(filt, args, NULL)) {
+    if(avfilter_init_filter(filt_ctx, args, NULL)) {
         av_log(log_ctx, AV_LOG_ERROR,
-               "error initializing filter '%s' with args '%s'\n", name, args);
+               "error initializing filter '%s' with args '%s'\n", filt_name, args);
         return NULL;
     }
 
-    return filt;
+    return filt_ctx;
 }
 
 /**
@@ -163,20 +127,25 @@ static AVFilterContext *parse_filter(const char **buf, AVFilterGraph *graph,
                                      int index, AVClass *log_ctx)
 {
     char *opts = NULL;
-    char *name = consume_string(buf);
+    char *name = av_get_token(buf, "=,;[\n");
+    AVFilterContext *ret;
 
     if(**buf == '=') {
         (*buf)++;
-        opts = consume_string(buf);
+        opts = av_get_token(buf, "[],;\n");
     }
 
-    return create_filter(graph, index, name, opts, log_ctx);
+    ret = create_filter(graph, index, name, opts, log_ctx);
+    av_free(name);
+    av_free(opts);
+    return ret;
 }
 
 static void free_inout(AVFilterInOut *head)
 {
     while(head) {
         AVFilterInOut *next = head->next;
+        av_free(head->name);
         av_free(head);
         head = next;
     }
@@ -204,15 +173,13 @@ static void insert_inout(AVFilterInOut **inouts, AVFilterInOut *element)
 }
 
 static int link_filter_inouts(AVFilterContext *filter,
-                              AVFilterInOut **currInputs,
-                              AVFilterInOut **openLinks, AVClass *log_ctx)
+                              AVFilterInOut **curr_inputs,
+                              AVFilterInOut **open_inputs, AVClass *log_ctx)
 {
-    int pad = 0;
+    int pad = filter->input_count;
 
-    pad = filter->input_count;
     while(pad--) {
-        AVFilterInOut *p = *currInputs;
-        *currInputs = (*currInputs)->next;
+        AVFilterInOut *p = *curr_inputs;
         if(!p) {
             av_log(log_ctx, AV_LOG_ERROR,
                    "Not enough inputs specified for the \"%s\" filter.\n",
@@ -220,18 +187,21 @@ static int link_filter_inouts(AVFilterContext *filter,
             return -1;
         }
 
+        *curr_inputs = (*curr_inputs)->next;
+
         if(p->filter) {
             if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx))
                 return -1;
+            av_free(p->name);
             av_free(p);
         } else {
             p->filter = filter;
             p->pad_idx = pad;
-            insert_inout(openInputs, p);
+            insert_inout(open_inputs, p);
         }
     }
 
-    if(*currInputs) {
+    if(*curr_inputs) {
         av_log(log_ctx, AV_LOG_ERROR,
                "Too many inputs specified for the \"%s\" filter.\n",
                filter->filter->name);
@@ -241,17 +211,16 @@ static int link_filter_inouts(AVFilterContext *filter,
     pad = filter->output_count;
     while(pad--) {
         AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
-        currlinkn->type    = LinkTypeOut;
         currlinkn->filter  = filter;
         currlinkn->pad_idx = pad;
-        insert_inout(currInputs, currlinkn);
+        insert_inout(curr_inputs, currlinkn);
     }
 
     return 0;
 }
 
-static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
-                        AVFilterInOut **openLinks, AVClass *log_ctx)
+static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,
+                        AVFilterInOut **open_outputs, AVClass *log_ctx)
 {
     int pad = 0;
 
@@ -262,36 +231,30 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
         if(!name)
             return -1;
 
-        /* First check if the label is not in the openLinks list */
-        match = extract_inout(name, openLinks);
+        /* First check if the label is not in the open_outputs list */
+        match = extract_inout(name, open_outputs);
 
         if(match) {
-            /* A label of a open link. Make it one of the inputs of the next
-               filter */
-            if(match->type != LinkTypeOut) {
-                av_log(log_ctx, AV_LOG_ERROR,
-                       "Label \"%s\" appears twice as input!\n", match->name);
-                return -1;
-            }
+            av_free(name);
         } else {
             /* Not in the list, so add it as an input */
             match = av_mallocz(sizeof(AVFilterInOut));
             match->name    = name;
-            match->type    = LinkTypeIn;
             match->pad_idx = pad;
         }
 
-        insert_inout(currInputs, match);
+        insert_inout(curr_inputs, match);
 
-        *buf += consume_whitespace(*buf);
+        *buf += strspn(*buf, WHITESPACES);
         pad++;
     }
 
     return pad;
 }
 
-static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
-                         AVFilterInOut **openLinks, AVClass *log_ctx)
+static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs,
+                         AVFilterInOut **open_inputs,
+                         AVFilterInOut **open_outputs, AVClass *log_ctx)
 {
     int pad = 0;
 
@@ -299,55 +262,49 @@ static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
         char *name = parse_link_name(buf, log_ctx);
         AVFilterInOut *match;
 
-        AVFilterInOut *input = *currInputs;
-        *currInputs = (*currInputs)->next;
+        AVFilterInOut *input = *curr_inputs;
+        *curr_inputs = (*curr_inputs)->next;
 
         if(!name)
             return -1;
 
-        /* First check if the label is not in the openLinks list */
-        match = extract_inout(name, openLinks);
+        /* First check if the label is not in the open_inputs list */
+        match = extract_inout(name, open_inputs);
 
         if(match) {
-            /* A label of a open link. Link it. */
-            if(match->type != LinkTypeIn) {
-                av_log(log_ctx, AV_LOG_ERROR,
-                       "Label \"%s\" appears twice as output!\n", match->name);
-                return -1;
-            }
-
             if(link_filter(input->filter, input->pad_idx,
                            match->filter, match->pad_idx, log_ctx) < 0)
                 return -1;
+            av_free(match->name);
+            av_free(name);
             av_free(match);
             av_free(input);
         } else {
-            /* Not in the list, so add the first input as a openLink */
-            input->next = *openLinks;
-            input->type = LinkTypeOut;
+            /* Not in the list, so add the first input as a open_output */
             input->name = name;
-            insert_inout(openOutputs, input);
+            insert_inout(open_outputs, input);
         }
-        *buf += consume_whitespace(*buf);
+        *buf += strspn(*buf, WHITESPACES);
         pad++;
     }
 
     return pad;
 }
 
-int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
-                         AVFilterInOut *openLinks, AVClass *log_ctx)
+int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
+                         AVFilterInOut *open_inputs,
+                         AVFilterInOut *open_outputs, AVClass *log_ctx)
 {
     int index = 0;
     char chr = 0;
 
-    AVFilterInOut *currInputs = NULL;
+    AVFilterInOut *curr_inputs = NULL;
 
     do {
         AVFilterContext *filter;
-        filters += consume_whitespace(filters);
+        filters += strspn(filters, WHITESPACES);
 
-        if(parse_inputs(&filters, &currInputs, &openLinks, log_ctx) < 0)
+        if(parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx) < 0)
             goto fail;
 
         filter = parse_filter(&filters, graph, index, log_ctx);
@@ -355,23 +312,24 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
         if(!filter)
             goto fail;
 
-        if(filter->input_count == 1 && !currInputs && !index) {
-            /* First input can be ommitted if it is "[in]" */
+        if(filter->input_count == 1 && !curr_inputs && !index) {
+            /* First input can be omitted if it is "[in]" */
             const char *tmp = "[in]";
-            if(parse_inputs(&tmp, &currInputs, &openLinks, log_ctx))
+            if(parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx) < 0)
                 goto fail;
         }
 
-        if(link_filter_inouts(filter, &currInputs, &openLinks, log_ctx) < 0)
+        if(link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx) < 0)
             goto fail;
 
-        if(parse_outputs(&filters, &currInputs, &openLinks, log_ctx))
+        if(parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
+                         log_ctx) < 0)
             goto fail;
 
-        filters += consume_whitespace(filters);
+        filters += strspn(filters, WHITESPACES);
         chr = *filters++;
 
-        if(chr == ';' && currInputs) {
+        if(chr == ';' && curr_inputs) {
             av_log(log_ctx, AV_LOG_ERROR,
                    "Could not find a output to link when parsing \"%s\"\n",
                    filters - 1);
@@ -380,18 +338,27 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
         index++;
     } while(chr == ',' || chr == ';');
 
-    if(openLinks && !strcmp(openLinks->name, "out") && currInputs) {
-        /* Last output can be ommitted if it is "[out]" */
+    if (chr) {
+        av_log(log_ctx, AV_LOG_ERROR,
+               "Unable to parse graph description substring: \"%s\"\n",
+               filters - 1);
+        goto fail;
+    }
+
+    if(open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) {
+        /* Last output can be omitted if it is "[out]" */
         const char *tmp = "[out]";
-        if(parse_outputs(&tmp, &currInputs, &openLinks, log_ctx) < 0)
+        if(parse_outputs(&tmp, &curr_inputs, &open_inputs,
+                         &open_outputs, log_ctx) < 0)
             goto fail;
     }
 
     return 0;
 
  fail:
-    avfilter_destroy_graph(graph);
-    free_inout(openLinks);
-    free_inout(currInputs);
+    avfilter_graph_destroy(graph);
+    free_inout(open_inputs);
+    free_inout(open_outputs);
+    free_inout(curr_inputs);
     return -1;
 }