snprintf(inst_name, sizeof(inst_name), "Parsed filter %d", index);
- if(!(filterdef = avfilter_get_by_name(name))) {
+ filterdef = avfilter_get_by_name(name);
+
+ if(!filterdef) {
av_log(log_ctx, AV_LOG_ERROR,
"no such filter: '%s'\n", name);
return NULL;
}
- if(!(filt = avfilter_open(filterdef, inst_name))) {
+ 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)
+ 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,
/**
* 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 *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;
}
static void free_inout(AVFilterInOut *head)
{
while(head) {
AVFilterInOut *next = head->next;
+ av_free(head->name);
av_free(head);
head = next;
}
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)
{
- int pad = 0;
+ int pad = filter->input_count;
- 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->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;
+ av_free(p->name);
av_free(p);
} else {
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;
}
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 = parse_link_name(buf, log_ctx);
- AVFilterInOut *link_to_add;
AVFilterInOut *match;
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;
+
+ insert_inout(currInputs, match);
+
*buf += consume_whitespace(*buf);
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 */
- 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);
}
*buf += consume_whitespace(*buf);
pad++;
return pad;
}
-/**
- * Parse a string describing a filter graph.
- */
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;
- int pad = 0;
AVFilterInOut *currInputs = NULL;
AVFilterContext *filter;
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;
filters += consume_whitespace(filters);
index++;
} 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;
}
fail:
avfilter_destroy_graph(graph);
- free_inout(openLinks);
+ free_inout(openInputs);
+ free_inout(openOutputs);
free_inout(currInputs);
return -1;
}
projects / ffmpeg / blobdiff