* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <ctype.h>
#include <string.h>
+#include <stdio.h>
#include "libavutil/avstring.h"
+#include "libavutil/mem.h"
#include "avfilter.h"
-#include "avfiltergraph.h"
#define WHITESPACES " \n\t"
(*buf)++;
name = av_get_token(buf, "]");
+ if (!name)
+ goto fail;
if (!name[0]) {
av_log(log_ctx, AV_LOG_ERROR,
return name;
}
+#define TMP_ARGS_SIZE 256
+
+static void append_sws_flags(const char **args, const char *sws_opts, char *tmp)
+{
+ int nb_opts = 0;
+ const char *separator = ":";
+ const char *opt = *args;
+
+ if (strstr(*args, "flags"))
+ return;
+
+ if (strstr(*args, "="))
+ separator = ":flags=";
+
+ while ((opt = strstr(opt, ":")) && *opt) {
+ av_log(NULL, AV_LOG_INFO, "opts '%s' \n", opt);
+ if (nb_opts > 2) {
+ return;
+ }
+ nb_opts++;
+ opt++;
+ }
+
+ opt = strstr(sws_opts, "flags=");
+ if (opt && strlen(opt) > 6)
+ opt += 6;
+ else
+ opt = sws_opts;
+
+ snprintf(tmp, TMP_ARGS_SIZE, "%s%s%s",
+ *args, separator, opt);
+
+ *args = tmp;
+}
+
/**
* Create an instance of a filter, initialize and insert it in the
* filtergraph in *ctx.
{
AVFilter *filt;
char inst_name[30];
- char tmp_args[256];
+ char tmp_args[TMP_ARGS_SIZE];
int ret;
snprintf(inst_name, sizeof(inst_name), "Parsed filter %d %s", index, filt_name);
return AVERROR(EINVAL);
}
- ret = avfilter_open(filt_ctx, filt, inst_name);
+ *filt_ctx = avfilter_graph_alloc_filter(ctx, filt, inst_name);
if (!*filt_ctx) {
av_log(log_ctx, AV_LOG_ERROR,
"Error creating filter '%s'\n", filt_name);
- return ret;
- }
-
- if ((ret = avfilter_graph_add_filter(ctx, *filt_ctx)) < 0) {
- avfilter_free(*filt_ctx);
- return ret;
+ return AVERROR(ENOMEM);
}
- if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags")) {
- snprintf(tmp_args, sizeof(tmp_args), "%s:%s",
- args, ctx->scale_sws_opts);
- args = tmp_args;
+ if (!strcmp(filt_name, "scale") && args &&
+ ctx->scale_sws_opts) {
+ append_sws_flags(&args, ctx->scale_sws_opts, tmp_args);
}
- if ((ret = avfilter_init_filter(*filt_ctx, args, NULL)) < 0) {
+ ret = avfilter_init_str(*filt_ctx, args);
+ if (ret < 0) {
av_log(log_ctx, AV_LOG_ERROR,
- "Error initializing filter '%s' with args '%s'\n", filt_name, args);
+ "Error initializing filter '%s'", filt_name);
+ if (args)
+ av_log(log_ctx, AV_LOG_ERROR, " with args '%s'", args);
+ av_log(log_ctx, AV_LOG_ERROR, "\n");
+ avfilter_free(*filt_ctx);
return ret;
}
return ret;
}
-static void free_inout(AVFilterInOut *head)
+AVFilterInOut *avfilter_inout_alloc(void)
+{
+ return av_mallocz(sizeof(AVFilterInOut));
+}
+
+void avfilter_inout_free(AVFilterInOut **inout)
{
- while (head) {
- AVFilterInOut *next = head->next;
- av_free(head->name);
- av_free(head);
- head = next;
+ while (*inout) {
+ AVFilterInOut *next = (*inout)->next;
+ av_freep(&(*inout)->name);
+ av_freep(inout);
+ *inout = next;
}
}
{
AVFilterInOut *ret;
- while (*links && strcmp((*links)->name, label))
+ while (*links && (!(*links)->name || strcmp((*links)->name, label)))
links = &((*links)->next);
ret = *links;
- if (ret)
+ if (ret) {
*links = ret->next;
+ ret->next = NULL;
+ }
return ret;
}
*inouts = element;
}
+static void append_inout(AVFilterInOut **inouts, AVFilterInOut **element)
+{
+ while (*inouts && (*inouts)->next)
+ inouts = &((*inouts)->next);
+
+ if (!*inouts)
+ *inouts = *element;
+ else
+ (*inouts)->next = *element;
+ *element = NULL;
+}
+
static int link_filter_inouts(AVFilterContext *filt_ctx,
AVFilterInOut **curr_inputs,
AVFilterInOut **open_inputs, void *log_ctx)
{
- int pad = filt_ctx->input_count, ret;
+ int pad, ret;
- while (pad--) {
+ for (pad = 0; pad < filt_ctx->nb_inputs; pad++) {
AVFilterInOut *p = *curr_inputs;
- if (!p) {
- av_log(log_ctx, AV_LOG_ERROR,
- "Not enough inputs specified for the \"%s\" filter.\n",
- filt_ctx->filter->name);
- return AVERROR(EINVAL);
- }
- *curr_inputs = (*curr_inputs)->next;
+ if (p) {
+ *curr_inputs = (*curr_inputs)->next;
+ p->next = NULL;
+ } else if (!(p = av_mallocz(sizeof(*p))))
+ return AVERROR(ENOMEM);
if (p->filter_ctx) {
- if ((ret = link_filter(p->filter_ctx, p->pad_idx, filt_ctx, pad, log_ctx)) < 0)
- return ret;
+ ret = link_filter(p->filter_ctx, p->pad_idx, filt_ctx, pad, log_ctx);
av_free(p->name);
av_free(p);
+ if (ret < 0)
+ return ret;
} else {
p->filter_ctx = filt_ctx;
p->pad_idx = pad;
- insert_inout(open_inputs, p);
+ append_inout(open_inputs, &p);
}
}
return AVERROR(EINVAL);
}
- pad = filt_ctx->output_count;
+ pad = filt_ctx->nb_outputs;
while (pad--) {
AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
if (!currlinkn)
static int parse_inputs(const char **buf, AVFilterInOut **curr_inputs,
AVFilterInOut **open_outputs, void *log_ctx)
{
+ AVFilterInOut *parsed_inputs = NULL;
int pad = 0;
while (**buf == '[') {
av_free(name);
} else {
/* Not in the list, so add it as an input */
- if (!(match = av_mallocz(sizeof(AVFilterInOut))))
+ if (!(match = av_mallocz(sizeof(AVFilterInOut)))) {
+ av_free(name);
return AVERROR(ENOMEM);
+ }
match->name = name;
match->pad_idx = pad;
}
- insert_inout(curr_inputs, match);
+ append_inout(&parsed_inputs, &match);
*buf += strspn(*buf, WHITESPACES);
pad++;
}
+ append_inout(&parsed_inputs, curr_inputs);
+ *curr_inputs = parsed_inputs;
+
return pad;
}
AVFilterInOut *match;
AVFilterInOut *input = *curr_inputs;
+
+ if (!name)
+ return AVERROR(EINVAL);
+
if (!input) {
av_log(log_ctx, AV_LOG_ERROR,
- "No output pad can be associated to link label '%s'.\n",
- name);
+ "No output pad can be associated to link label '%s'.\n", name);
+ av_free(name);
return AVERROR(EINVAL);
}
*curr_inputs = (*curr_inputs)->next;
- if (!name)
- return AVERROR(EINVAL);
-
/* First check if the label is not in the open_inputs list */
match = extract_inout(name, open_inputs);
if (match) {
if ((ret = link_filter(input->filter_ctx, input->pad_idx,
- match->filter_ctx, match->pad_idx, log_ctx)) < 0)
+ match->filter_ctx, match->pad_idx, log_ctx)) < 0) {
+ av_free(name);
return ret;
+ }
av_free(match->name);
av_free(name);
av_free(match);
return pad;
}
-int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
- AVFilterInOut *open_inputs,
- AVFilterInOut *open_outputs, AVClass *log_ctx)
+static int parse_sws_flags(const char **buf, AVFilterGraph *graph)
+{
+ char *p = strchr(*buf, ';');
+
+ if (strncmp(*buf, "sws_flags=", 10))
+ return 0;
+
+ if (!p) {
+ av_log(graph, AV_LOG_ERROR, "sws_flags not terminated with ';'.\n");
+ return AVERROR(EINVAL);
+ }
+
+ *buf += 4; // keep the 'flags=' part
+
+ av_freep(&graph->scale_sws_opts);
+ if (!(graph->scale_sws_opts = av_mallocz(p - *buf + 1)))
+ return AVERROR(ENOMEM);
+ av_strlcpy(graph->scale_sws_opts, *buf, p - *buf + 1);
+
+ *buf = p + 1;
+ return 0;
+}
+
+int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
+ AVFilterInOut **inputs,
+ AVFilterInOut **outputs)
{
int index = 0, ret;
char chr = 0;
- AVFilterInOut *curr_inputs = NULL;
+ AVFilterInOut *curr_inputs = NULL, *open_inputs = NULL, *open_outputs = NULL;
+
+ filters += strspn(filters, WHITESPACES);
+
+ if ((ret = parse_sws_flags(&filters, graph)) < 0)
+ goto fail;
do {
AVFilterContext *filter;
- const char *filterchain = filters;
filters += strspn(filters, WHITESPACES);
- if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0)
+ if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, graph)) < 0)
goto fail;
- if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0)
+ if ((ret = parse_filter(&filter, &filters, graph, index, graph)) < 0)
goto fail;
- if (filter->input_count == 1 && !curr_inputs && !index) {
- /* First input can be omitted if it is "[in]" */
- const char *tmp = "[in]";
- if ((ret = parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx)) < 0)
- goto fail;
- }
- if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0)
+ if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, graph)) < 0)
goto fail;
if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs,
- log_ctx)) < 0)
+ graph)) < 0)
goto fail;
filters += strspn(filters, WHITESPACES);
chr = *filters++;
- if (chr == ';' && curr_inputs) {
- av_log(log_ctx, AV_LOG_ERROR,
- "Invalid filterchain containing an unlabelled output pad: \"%s\"\n",
- filterchain);
- ret = AVERROR(EINVAL);
- goto fail;
- }
+ if (chr == ';' && curr_inputs)
+ append_inout(&open_outputs, &curr_inputs);
index++;
} while (chr == ',' || chr == ';');
if (chr) {
- av_log(log_ctx, AV_LOG_ERROR,
+ av_log(graph, AV_LOG_ERROR,
"Unable to parse graph description substring: \"%s\"\n",
filters - 1);
ret = AVERROR(EINVAL);
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 ((ret = parse_outputs(&tmp, &curr_inputs, &open_inputs, &open_outputs,
- log_ctx)) < 0)
- goto fail;
- }
+ append_inout(&open_outputs, &curr_inputs);
+ *inputs = open_inputs;
+ *outputs = open_outputs;
return 0;
fail:
- for (; graph->filter_count > 0; graph->filter_count--)
- avfilter_free(graph->filters[graph->filter_count - 1]);
+ while (graph->nb_filters)
+ avfilter_free(graph->filters[0]);
av_freep(&graph->filters);
- free_inout(open_inputs);
- free_inout(open_outputs);
- free_inout(curr_inputs);
+ avfilter_inout_free(&open_inputs);
+ avfilter_inout_free(&open_outputs);
+ avfilter_inout_free(&curr_inputs);
+
+ *inputs = NULL;
+ *outputs = NULL;
+
+ return ret;
+}
+
+int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
+ AVFilterInOut *open_inputs,
+ AVFilterInOut *open_outputs, void *log_ctx)
+{
+ int ret;
+ AVFilterInOut *cur, *match, *inputs = NULL, *outputs = NULL;
+
+ if ((ret = avfilter_graph_parse2(graph, filters, &inputs, &outputs)) < 0)
+ goto fail;
+
+ /* First input can be omitted if it is "[in]" */
+ if (inputs && !inputs->name)
+ inputs->name = av_strdup("in");
+ for (cur = inputs; cur; cur = cur->next) {
+ if (!cur->name) {
+ av_log(log_ctx, AV_LOG_ERROR,
+ "Not enough inputs specified for the \"%s\" filter.\n",
+ cur->filter_ctx->filter->name);
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
+ if (!(match = extract_inout(cur->name, &open_outputs)))
+ continue;
+ ret = avfilter_link(match->filter_ctx, match->pad_idx,
+ cur->filter_ctx, cur->pad_idx);
+ avfilter_inout_free(&match);
+ if (ret < 0)
+ goto fail;
+ }
+
+ /* Last output can be omitted if it is "[out]" */
+ if (outputs && !outputs->name)
+ outputs->name = av_strdup("out");
+ for (cur = outputs; cur; cur = cur->next) {
+ if (!cur->name) {
+ av_log(log_ctx, AV_LOG_ERROR,
+ "Invalid filterchain containing an unlabelled output pad: \"%s\"\n",
+ filters);
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
+ if (!(match = extract_inout(cur->name, &open_inputs)))
+ continue;
+ ret = avfilter_link(cur->filter_ctx, cur->pad_idx,
+ match->filter_ctx, match->pad_idx);
+ avfilter_inout_free(&match);
+ if (ret < 0)
+ goto fail;
+ }
+
+ fail:
+ if (ret < 0) {
+ while (graph->nb_filters)
+ avfilter_free(graph->filters[0]);
+ av_freep(&graph->filters);
+ }
+ avfilter_inout_free(&inputs);
+ avfilter_inout_free(&outputs);
+ avfilter_inout_free(&open_inputs);
+ avfilter_inout_free(&open_outputs);
return ret;
}
projects / ffmpeg / blobdiff