]> git.sesse.net Git - ffmpeg/blobdiff - libavfilter/graphparser.c
bump lavf micro version to allow checking for the matroska/ASS bugfix in r15211
[ffmpeg] / libavfilter / graphparser.c
index 6865ccd89e2f9263f0844fc729a46a7c37585be0..25c5c4d25890c4d1144be1691fbf95a347b1f97c 100644 (file)
 #include <ctype.h>
 #include <string.h>
 
+#include "graphparser.h"
 #include "avfilter.h"
 #include "avfiltergraph.h"
 
-static AVFilterContext *create_filter(AVFilterGraph *ctx, int index,
-                                      const char *name, const char *args,
-                                      AVClass *log_ctx)
-{
-    AVFilterContext *filt;
-
-    AVFilter *filterdef;
-    char inst_name[30];
-
-    snprintf(inst_name, sizeof(inst_name), "Parsed filter %d", index);
-
-    if(!(filterdef = avfilter_get_by_name(name))) {
-        av_log(log_ctx, AV_LOG_ERROR,
-               "no such filter: '%s'\n", name);
-        return NULL;
-    }
-
-    if(!(filt = avfilter_open(filterdef, inst_name))) {
-        av_log(log_ctx, AV_LOG_ERROR,
-               "error creating filter '%s'\n", name);
-        return NULL;
-    }
-
-    if(avfilter_graph_add_filter(ctx, filt) < 0)
-        return NULL;
-
-    if(avfilter_init_filter(filt, args, NULL)) {
-        av_log(log_ctx, AV_LOG_ERROR,
-               "error initializing filter '%s' with args '%s'\n", name, args);
-        return NULL;
-    }
-
-    return filt;
-}
-
 static int link_filter(AVFilterContext *src, int srcpad,
                        AVFilterContext *dst, int dstpad,
                        AVClass *log_ctx)
@@ -75,9 +41,9 @@ static int link_filter(AVFilterContext *src, int srcpad,
     return 0;
 }
 
-static void consume_whitespace(const char **buf)
+static int consume_whitespace(const char *buf)
 {
-    *buf += strspn(*buf, " \n\t");
+    return strspn(buf, " \n\t");
 }
 
 /**
@@ -89,17 +55,17 @@ static char *consume_string(const char **buf)
     char *out = av_malloc(strlen(*buf) + 1);
     char *ret = out;
 
-    consume_whitespace(buf);
+    *buf += consume_whitespace(*buf);
 
     do{
         char c = *(*buf)++;
         switch (c) {
         case '\\':
-            *out++= *(*buf)++;
+            *out++ = *(*buf)++;
             break;
         case '\'':
             while(**buf && **buf != '\'')
-                *out++= *(*buf)++;
+                *out++ = *(*buf)++;
             if(**buf) (*buf)++;
             break;
         case 0:
@@ -110,32 +76,33 @@ static char *consume_string(const char **buf)
         case ';':
         case ' ':
         case '\n':
-            *out++= 0;
+            *out++ = 0;
             break;
         default:
-            *out++= c;
+            *out++ = c;
         }
     } while(out[-1]);
 
     (*buf)--;
-    consume_whitespace(buf);
+    *buf += consume_whitespace(*buf);
 
     return ret;
 }
 
 /**
  * Parse "[linkname]"
- * @arg name a pointer (that need to be free'd after use) to the name between
- *           parenthesis
+ * @param name a pointer (that need to be free'd after use) to the name between
+ *        parenthesis
  */
-static void parse_link_name(const char **buf, char **name, AVClass *log_ctx)
+static char *parse_link_name(const char **buf, AVClass *log_ctx)
 {
     const char *start = *buf;
+    char *name;
     (*buf)++;
 
-    *name = consume_string(buf);
+    name = consume_string(buf);
 
-    if(!*name[0]) {
+    if(!name[0]) {
         av_log(log_ctx, AV_LOG_ERROR,
                "Bad (empty?) label found in the following: \"%s\".\n", start);
         goto fail;
@@ -145,32 +112,78 @@ static void parse_link_name(const char **buf, char **name, AVClass *log_ctx)
         av_log(log_ctx, AV_LOG_ERROR,
                "Mismatched '[' found in the following: \"%s\".\n", start);
     fail:
-        av_freep(name);
+        av_freep(&name);
     }
+
+    return name;
 }
 
+static AVFilterContext *create_filter(AVFilterGraph *ctx, int index,
+                                      const char *name, const char *args,
+                                      AVClass *log_ctx)
+{
+    AVFilterContext *filt;
+
+    AVFilter *filterdef;
+    char inst_name[30];
+
+    snprintf(inst_name, sizeof(inst_name), "Parsed filter %d", index);
+
+    filterdef = avfilter_get_by_name(name);
+
+    if(!filterdef) {
+        av_log(log_ctx, AV_LOG_ERROR,
+               "no such filter: '%s'\n", name);
+        return NULL;
+    }
+
+    filt = avfilter_open(filterdef, inst_name);
+    if(!filt) {
+        av_log(log_ctx, AV_LOG_ERROR,
+               "error creating filter '%s'\n", name);
+        return NULL;
+    }
+
+    if(avfilter_graph_add_filter(ctx, filt) < 0) {
+        avfilter_destroy(filt);
+        return NULL;
+    }
+
+    if(avfilter_init_filter(filt, args, NULL)) {
+        av_log(log_ctx, AV_LOG_ERROR,
+               "error initializing filter '%s' with args '%s'\n", name, args);
+        return NULL;
+    }
 
-enum LinkType {
-    LinkTypeIn,
-    LinkTypeOut,
-};
+    return filt;
+}
 
 /**
- * A linked-list of the inputs/outputs of the filter chain.
+ * Parse "filter=params"
  */
-typedef struct AVFilterInOut {
-    enum LinkType type;
-    const char *name;
-    AVFilterContext *filter;
-    int pad_idx;
+static AVFilterContext *parse_filter(const char **buf, AVFilterGraph *graph,
+                                     int index, AVClass *log_ctx)
+{
+    char *opts = NULL;
+    char *name = consume_string(buf);
+    AVFilterContext *ret;
 
-    struct AVFilterInOut *next;
-} AVFilterInOut;
+    if(**buf == '=') {
+        (*buf)++;
+        opts = consume_string(buf);
+    }
+
+    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) {
+    while(head) {
         AVFilterInOut *next = head->next;
+        av_free(head->name);
         av_free(head);
         head = next;
     }
@@ -180,7 +193,6 @@ static AVFilterInOut *extract_inout(const char *label, AVFilterInOut **links)
 {
     AVFilterInOut *ret;
 
-
     while(*links && strcmp((*links)->name, label))
         links = &((*links)->next);
 
@@ -192,123 +204,86 @@ static AVFilterInOut *extract_inout(const char *label, AVFilterInOut **links)
     return ret;
 }
 
+static void insert_inout(AVFilterInOut **inouts, AVFilterInOut *element)
+{
+    element->next = *inouts;
+    *inouts = element;
+}
 
 static int link_filter_inouts(AVFilterContext *filter,
                               AVFilterInOut **currInputs,
-                              AVFilterInOut **openLinks, AVClass *log_ctx)
+                              AVFilterInOut **openInputs, AVClass *log_ctx)
 {
-    AVFilterInOut *p;
-    int pad = 0;
+    int pad = filter->input_count;
 
-    pad = filter->input_count;
     while(pad--) {
-        p = *currInputs;
+        AVFilterInOut *p = *currInputs;
         if(!p) {
             av_log(log_ctx, AV_LOG_ERROR,
                    "Not enough inputs specified for the \"%s\" filter.\n",
-                   filter->name);
+                   filter->filter->name);
             return -1;
         }
 
+        *currInputs = (*currInputs)->next;
+
         if(p->filter) {
             if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx))
                 return -1;
-            *currInputs = (*currInputs)->next;
+            av_free(p->name);
             av_free(p);
         } else {
-            *currInputs = (*currInputs)->next;
             p->filter = filter;
             p->pad_idx = pad;
-            p->next = *openLinks;
-            *openLinks = p;
+            insert_inout(openInputs, p);
         }
     }
 
-
     if(*currInputs) {
         av_log(log_ctx, AV_LOG_ERROR,
                "Too many inputs specified for the \"%s\" filter.\n",
-               filter->name);
+               filter->filter->name);
         return -1;
     }
 
     pad = filter->output_count;
     while(pad--) {
-        AVFilterInOut *currlinkn = av_malloc(sizeof(AVFilterInOut));
-        currlinkn->name    = NULL;
-        currlinkn->type    = LinkTypeOut;
+        AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
         currlinkn->filter  = filter;
         currlinkn->pad_idx = pad;
-        currlinkn->next    = *currInputs;
-        *currInputs = currlinkn;
+        insert_inout(currInputs, currlinkn);
     }
 
     return 0;
 }
 
-/**
- * Parse "filter=params"
- * @arg name a pointer (that need to be free'd after use) to the name of the
- *           filter
- * @arg ars  a pointer (that need to be free'd after use) to the args of the
- *           filter
- */
-static AVFilterContext *parse_filter(const char **buf, AVFilterGraph *graph,
-                                     int index, AVClass *log_ctx)
-{
-    char *opts;
-    char *name = consume_string(buf);
-
-    if(**buf == '=') {
-        (*buf)++;
-        opts = consume_string(buf);
-    } else {
-        opts = NULL;
-    }
-
-    return create_filter(graph, index, name, opts, log_ctx);
-}
-
 static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
-                        AVFilterInOut **openLinks, AVClass *log_ctx)
+                        AVFilterInOut **openOutputs, AVClass *log_ctx)
 {
     int pad = 0;
 
-    while (**buf == '[') {
-        char *name;
-        AVFilterInOut *link_to_add;
+    while(**buf == '[') {
+        char *name = parse_link_name(buf, log_ctx);
         AVFilterInOut *match;
 
-        parse_link_name(buf, &name, log_ctx);
-
         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 openOutputs list */
+        match = extract_inout(name, openOutputs);
 
         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;
-            }
-
-            link_to_add = match;
+            av_free(name);
         } else {
             /* Not in the list, so add it as an input */
-            link_to_add = av_malloc(sizeof(AVFilterInOut));
-
-            link_to_add->name    = name;
-            link_to_add->type    = LinkTypeIn;
-            link_to_add->filter  = NULL;
-            link_to_add->pad_idx = pad;
+            match = av_mallocz(sizeof(AVFilterInOut));
+            match->name    = name;
+            match->pad_idx = pad;
         }
-        link_to_add->next = *currInputs;
-        *currInputs = link_to_add;
-        consume_whitespace(buf);
+
+        insert_inout(currInputs, match);
+
+        *buf += consume_whitespace(*buf);
         pad++;
     }
 
@@ -316,123 +291,96 @@ static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
 }
 
 static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
-                         AVFilterInOut **openLinks, AVClass *log_ctx)
+                         AVFilterInOut **openInputs,
+                         AVFilterInOut **openOutputs, AVClass *log_ctx)
 {
     int pad = 0;
 
-    while (**buf == '[') {
-        char *name;
+    while(**buf == '[') {
+        char *name = parse_link_name(buf, log_ctx);
         AVFilterInOut *match;
 
         AVFilterInOut *input = *currInputs;
         *currInputs = (*currInputs)->next;
 
-        parse_link_name(buf, &name, log_ctx);
-
         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 openInputs list */
+        match = extract_inout(name, openInputs);
 
         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 openOutput */
             input->name = name;
-            *openLinks = input;
+            insert_inout(openOutputs, input);
         }
-        consume_whitespace(buf);
+        *buf += consume_whitespace(*buf);
         pad++;
     }
 
     return pad;
 }
 
-/**
- * Parse a string describing a filter graph.
- */
 int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
-                         AVFilterContext *in, int inpad,
-                         AVFilterContext *out, int outpad,
-                         AVClass *log_ctx)
+                         AVFilterInOut *openInputs,
+                         AVFilterInOut *openOutputs, AVClass *log_ctx)
 {
     int index = 0;
     char chr = 0;
-    int pad = 0;
-
-    AVFilterInOut *currInputs=NULL;
-    AVFilterInOut *openLinks  = av_malloc(sizeof(AVFilterInOut));
-
-    openLinks->name    = "in";
-    openLinks->filter  = in;
-    openLinks->type    = LinkTypeOut;
-    openLinks->pad_idx = inpad;
-    openLinks->next    = av_malloc(sizeof(AVFilterInOut));
 
-    openLinks->next->name    = "out";
-    openLinks->next->filter  = out;
-    openLinks->next->type    = LinkTypeIn;
-    openLinks->next->pad_idx = outpad;
-    openLinks->next->next    = NULL;
+    AVFilterInOut *currInputs = NULL;
 
     do {
         AVFilterContext *filter;
-        consume_whitespace(&filters);
+        filters += consume_whitespace(filters);
 
-        pad = parse_inputs(&filters, &currInputs, &openLinks, log_ctx);
-
-        if(pad < 0)
+        if(parse_inputs(&filters, &currInputs, &openOutputs, log_ctx) < 0)
             goto fail;
 
-        if(!(filter = parse_filter(&filters, graph, index, log_ctx)))
+        filter = parse_filter(&filters, graph, index, log_ctx);
+
+        if(!filter)
             goto fail;
 
         if(filter->input_count == 1 && !currInputs && !index) {
-            // First input can be ommitted if it is "[in]"
+            /* First input can be ommitted if it is "[in]" */
             const char *tmp = "[in]";
-            pad = parse_inputs(&tmp, &currInputs, &openLinks, log_ctx);
-            if (pad < 0)
+            if(parse_inputs(&tmp, &currInputs, &openOutputs, log_ctx) < 0)
                 goto fail;
         }
 
-        if(link_filter_inouts(filter, &currInputs, &openLinks, log_ctx) < 0)
+        if(link_filter_inouts(filter, &currInputs, &openInputs, log_ctx) < 0)
             goto fail;
 
-        pad = parse_outputs(&filters, &currInputs, &openLinks, log_ctx);
-
-        if(pad < 0)
+        if(parse_outputs(&filters, &currInputs, &openInputs, &openOutputs,
+                         log_ctx) < 0)
             goto fail;
 
-        consume_whitespace(&filters);
+        filters += consume_whitespace(filters);
         chr = *filters++;
 
-        if (chr == ';' && currInputs) {
+        if(chr == ';' && currInputs) {
             av_log(log_ctx, AV_LOG_ERROR,
                    "Could not find a output to link when parsing \"%s\"\n",
                    filters - 1);
             goto fail;
         }
         index++;
-    } while (chr == ',' || chr == ';');
+    } while(chr == ',' || chr == ';');
 
-    if(openLinks && !strcmp(openLinks->name, "out") && currInputs) {
-        // Last output can be ommitted if it is "[out]"
+    if(openInputs && !strcmp(openInputs->name, "out") && currInputs) {
+        /* Last output can be ommitted if it is "[out]" */
         const char *tmp = "[out]";
-        if(parse_outputs(&tmp, &currInputs, &openLinks, log_ctx) < 0)
+        if(parse_outputs(&tmp, &currInputs, &openInputs,
+                         &openOutputs, log_ctx) < 0)
             goto fail;
     }
 
@@ -440,7 +388,8 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
 
  fail:
     avfilter_destroy_graph(graph);
-    free_inout(openLinks);
+    free_inout(openInputs);
+    free_inout(openOutputs);
     free_inout(currInputs);
     return -1;
 }