Split openLinks linked list into openInputs and openOutputs Commited in SoC by Vitor Sessak on 2008-05-24 17:20:09

Originally committed as revision 13360 to svn://svn.ffmpeg.org/ffmpeg/trunk

Vitor Sessak committed 18 years ago

Commit e2b5fda1 parent 64fbf5e2 files · +23 −41Browse files

Showing the changes to libavfilter/graphparser.c (1 of 2 files). Show all

Unified · Split

 static int link_filter_inouts(AVFilterContext *filter,
                               AVFilterInOut **currInputs,
-                              AVFilterInOut **openLinks, AVClass *log_ctx)
+                              AVFilterInOut **openInputs, AVClass *log_ctx)
 {
     int pad = filter->input_count;
     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);
 }
 static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
-                        AVFilterInOut **openLinks, AVClass *log_ctx)
+                        AVFilterInOut **openOutputs, AVClass *log_ctx)
 {
     int pad = 0;
         if(!name)
             return -1;
-        /* First check if the label is not in the openLinks list */
+        /* First check if the label is not in the openOutputs list */
-        match = extract_inout(name, openLinks);
+        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;
-            }
             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;
         }
 }
 static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
-                         AVFilterInOut **openLinks, AVClass *log_ctx)
+                         AVFilterInOut **openInputs,
+                         AVFilterInOut **openOutputs, AVClass *log_ctx)
 {
     int pad = 0;
         if(!name)
             return -1;
-        /* First check if the label is not in the openLinks list */
+        /* First check if the label is not in the openInputs list */
-        match = extract_inout(name, openLinks);
+        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);
             av_free(input);
         } else {
-            /* Not in the list, so add the first input as a openLink */
+            /* Not in the list, so add the first input as a openOutput */
-            input->next = *openLinks;
-            input->type = LinkTypeOut;
             input->name = name;
             insert_inout(openOutputs, input);
         }
 }
 int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
-                         AVFilterInOut *openLinks, AVClass *log_ctx)
+                         AVFilterInOut *openInputs,
+                         AVFilterInOut *openOutputs, AVClass *log_ctx)
 {
     int index = 0;
     char chr = 0;
         AVFilterContext *filter;
         filters += consume_whitespace(filters);
-        if(parse_inputs(&filters, &currInputs, &openLinks, log_ctx) < 0)
+        if(parse_inputs(&filters, &currInputs, &openOutputs, log_ctx) < 0)
             goto fail;
         filter = parse_filter(&filters, graph, index, 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))
+            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;
-        if(parse_outputs(&filters, &currInputs, &openLinks, log_ctx))
+        if(parse_outputs(&filters, &currInputs, &openInputs, &openOutputs,
+                         log_ctx) < 0)
             goto fail;
         filters += consume_whitespace(filters);
         index++;
     } while(chr == ',' || chr == ';');
-    if(openLinks && !strcmp(openLinks->name, "out") && currInputs) {
+    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;
     }
  fail:
     avfilter_destroy_graph(graph);
-    free_inout(openLinks);
+    free_inout(openInputs);
+    free_inout(openOutputs);
     free_inout(currInputs);
     return -1;
 }

Split openLinks linked list into openInputs and openOutputs Commited in SoC by Vitor Sessak on 2008-05-24 17:20:09

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code