]> git.sesse.net Git - ffmpeg/blobdiff - libavfilter/graphparser.c
Plug some memory leaks
[ffmpeg] / libavfilter / graphparser.c
index a3cd9b714c4d6182d0b6236241fe8c3bc6642f74..2a8a0179905c886e19ae4d358f2fcf244cabf9a6 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:
@@ -107,34 +73,36 @@ static char *consume_string(const char **buf)
         case '[':
         case '=':
         case ',':
+        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;
@@ -144,234 +112,295 @@ 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;
+    }
+
+    return filt;
 }
 
 /**
  * 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)
+static AVFilterContext *parse_filter(const char **buf, AVFilterGraph *graph,
+                                     int index, AVClass *log_ctx)
 {
-    char *name, *opts;
-    name = consume_string(buf);
+    char *opts = NULL;
+    char *name = consume_string(buf);
+    AVFilterContext *ret;
 
     if(**buf == '=') {
         (*buf)++;
         opts = consume_string(buf);
-    } else {
-        opts = NULL;
     }
 
-    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;
 }
 
-enum LinkType {
-    LinkTypeIn,
-    LinkTypeOut,
-};
-
-/**
- * A linked-list of the inputs/outputs of the filter chain.
- */
-typedef struct AVFilterInOut {
-    enum LinkType type;
-    char *name;
-    AVFilterContext *filter;
-    int pad_idx;
-
-    struct AVFilterInOut *next;
-} AVFilterInOut;
-
 static void free_inout(AVFilterInOut *head)
 {
-    while (head) {
+    while(head) {
         AVFilterInOut *next = head->next;
+        av_free(head->name);
         av_free(head);
         head = next;
     }
 }
 
-/**
- * Process a link. This funcion looks for a matching label in the *inout
- * linked list. If none is found, it adds this link to the list.
- */
-static int handle_link(char *name, AVFilterInOut **inout, int pad,
-                       enum LinkType type, AVFilterContext *filter,
-                       AVClass *log_ctx)
+static AVFilterInOut *extract_inout(const char *label, AVFilterInOut **links)
 {
-    AVFilterInOut *p = *inout;
+    AVFilterInOut *ret;
 
-    for (; p && strcmp(p->name, name); p = p->next);
+    while(*links && strcmp((*links)->name, label))
+        links = &((*links)->next);
 
-    if(!p) {
-        // First label apearence, add it to the linked list
-        AVFilterInOut *inoutn = av_malloc(sizeof(AVFilterInOut));
+    ret = *links;
 
-        inoutn->name    = name;
-        inoutn->type    = type;
-        inoutn->filter  = filter;
-        inoutn->pad_idx = pad;
-        inoutn->next    = *inout;
-        *inout = inoutn;
-         return 0;
-    }
+    if(ret)
+        *links = ret->next;
 
-    if(p->type == LinkTypeIn && type == LinkTypeOut) {
-        if(link_filter(filter, pad, p->filter, p->pad_idx, log_ctx) < 0)
-            return -1;
-    } else if(p->type == LinkTypeOut && type == LinkTypeIn) {
-        if(link_filter(p->filter, p->pad_idx, filter, pad, log_ctx) < 0)
+    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)
+{
+    int pad = filter->input_count;
+
+    while(pad--) {
+        AVFilterInOut *p = *currInputs;
+        *currInputs = (*currInputs)->next;
+        if(!p) {
+            av_log(log_ctx, AV_LOG_ERROR,
+                   "Not enough inputs specified for the \"%s\" filter.\n",
+                   filter->filter->name);
             return -1;
-    } else {
+        }
+
+        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);
+        }
+    }
+
+    if(*currInputs) {
         av_log(log_ctx, AV_LOG_ERROR,
-               "Two links named '%s' are either both input or both output\n",
-               name);
+               "Too many inputs specified for the \"%s\" filter.\n",
+               filter->filter->name);
         return -1;
     }
 
-    p->filter = NULL;
+    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);
+    }
 
     return 0;
 }
 
-
-/**
- * Parse "[a1][link2] ... [etc]"
- */
-static int parse_inouts(const char **buf, AVFilterInOut **inout, int pad,
-                        enum LinkType type, AVFilterContext *filter,
-                        AVClass *log_ctx)
+static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
+                        AVFilterInOut **openLinks, AVClass *log_ctx)
 {
-    while (**buf == '[') {
-        char *name;
+    int pad = 0;
 
-        parse_link_name(buf, &name, log_ctx);
+    while(**buf == '[') {
+        char *name = parse_link_name(buf, log_ctx);
+        AVFilterInOut *match;
 
         if(!name)
             return -1;
 
-        if(handle_link(name, inout, pad++, type, filter, log_ctx) < 0)
-            return -1;
+        /* First check if the label is not in the openLinks list */
+        match = extract_inout(name, openLinks);
+
+        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;
+            }
+        } 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);
 
-        consume_whitespace(buf);
+        *buf += consume_whitespace(*buf);
+        pad++;
     }
+
     return pad;
 }
 
-static const char *skip_inouts(const char *buf)
+static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
+                         AVFilterInOut **openLinks, AVClass *log_ctx)
 {
-    while (*buf == '[') {
-        buf += strcspn(buf, "]") + 1;
-        consume_whitespace(&buf);
+    int pad = 0;
+
+    while(**buf == '[') {
+        char *name = parse_link_name(buf, log_ctx);
+        AVFilterInOut *match;
+
+        AVFilterInOut *input = *currInputs;
+        *currInputs = (*currInputs)->next;
+
+        if(!name)
+            return -1;
+
+        /* First check if the label is not in the openLinks list */
+        match = extract_inout(name, openLinks);
+
+        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;
+            input->name = name;
+            insert_inout(openOutputs, input);
+        }
+        *buf += consume_whitespace(*buf);
+        pad++;
     }
-    return buf;
-}
 
+    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 *openLinks, AVClass *log_ctx)
 {
-    AVFilterInOut *inout=NULL;
-    AVFilterInOut  *head=NULL;
-
     int index = 0;
     char chr = 0;
-    int pad = 0;
-    int has_out = 0;
 
-    AVFilterContext *last_filt = NULL;
+    AVFilterInOut *currInputs = NULL;
 
     do {
         AVFilterContext *filter;
-        int oldpad = pad;
-        const char *inouts;
-
-        consume_whitespace(&filters);
-        inouts = filters;
+        filters += consume_whitespace(filters);
 
-        // We need to parse the inputs of the filter after we create it, so
-        // skip it by now
-        filters = skip_inouts(filters);
-
-        if(!(filter = parse_filter(&filters, graph, index, log_ctx)))
+        if(parse_inputs(&filters, &currInputs, &openLinks, log_ctx) < 0)
             goto fail;
 
-        pad = parse_inouts(&inouts, &inout, chr == ',', LinkTypeIn, filter,
-                           log_ctx);
+        filter = parse_filter(&filters, graph, index, log_ctx);
 
-        if(pad < 0)
+        if(!filter)
             goto fail;
 
-        // If the first filter has an input and none was given, it is
-        // implicitly the input of the whole graph.
-        if(pad == 0 && filter->input_count == 1) {
-            if(link_filter(in, inpad, filter, 0, log_ctx))
+        if(filter->input_count == 1 && !currInputs && !index) {
+            /* First input can be ommitted if it is "[in]" */
+            const char *tmp = "[in]";
+            if(parse_inputs(&tmp, &currInputs, &openLinks, log_ctx))
                 goto fail;
         }
 
-        if(chr == ',') {
-            if(link_filter(last_filt, oldpad, filter, 0, log_ctx) < 0)
-                goto fail;
-        }
-
-        pad = parse_inouts(&filters, &inout, 0, LinkTypeOut, filter, log_ctx);
-
-        if (pad < 0)
+        if(link_filter_inouts(filter, &currInputs, &openLinks, log_ctx) < 0)
             goto fail;
 
-        consume_whitespace(&filters);
+        if(parse_outputs(&filters, &currInputs, &openLinks, log_ctx))
+            goto fail;
 
+        filters += consume_whitespace(filters);
         chr = *filters++;
-        index++;
-        last_filt = filter;
-    } while (chr == ',' || chr == ';');
-
-    head = inout;
-    // Process remaining labels. Only inputs and outputs should be left.
-    for (; inout; inout = inout->next) {
-        if(!inout->filter)
-            continue; // Already processed
-
-        if(!strcmp(inout->name, "in")) {
-            if(link_filter(in, inpad, inout->filter, inout->pad_idx, log_ctx))
-                goto fail;
-
-        } else if(!strcmp(inout->name, "out")) {
-            has_out = 1;
 
-            if(link_filter(inout->filter, inout->pad_idx, out, outpad, log_ctx))
-                goto fail;
-
-        } else {
-            av_log(log_ctx, AV_LOG_ERROR, "Unmatched link: %s.\n",
-                   inout->name);
-                goto fail;
+        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;
         }
-    }
-
-    free_inout(head);
+        index++;
+    } while(chr == ',' || chr == ';');
 
-    if(!has_out) {
-        if(link_filter(last_filt, pad, out, outpad, log_ctx))
+    if(openLinks && !strcmp(openLinks->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)
             goto fail;
     }
 
     return 0;
 
  fail:
-    free_inout(head);
     avfilter_destroy_graph(graph);
+    free_inout(openLinks);
+    free_inout(currInputs);
     return -1;
 }