Originally committed as revision 12738 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -554,16 +554,25 @@ static AVFilterGraphDesc *parse_chain(const char *filters, int has_in) · 553 unmodified lines | |||
| 554 | /** | 554 | /** |
| 555 | * Parse a string describing a filter graph. | 555 | * Parse a string describing a filter graph. |
| 556 | */ | 556 | */ |
| 557 | AVFilterGraphDesc *avfilter_graph_parse_chain(const char *filters) | 557 | int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad) |
| 558 | { | 558 | { |
| 559 | AVFilterGraphDesc *ret; | 559 | AVFilterGraphDesc *desc; |
| 560 | 560 | ||
| 561 | /* Try first to parse supposing there is no (in) element */ | 561 | /* Try first to parse supposing there is no (in) element */ |
| 562 | if ((ret = parse_chain(filters, 0))) | 562 | if (!(desc = parse_chain(filters, 0))) { |
| 563 | return ret; | 563 | /* If it didn't work, parse supposing there is an (in) element */ |
| 564 | desc = parse_chain(filters, 1); | ||
| 565 | } | ||
| 566 | if (!desc) | ||
| 567 | return -1; | ||
| 568 | |||
| 569 | if (graph_load_from_desc3(graph, desc, in, inpad, out, outpad) < 0) { | ||
| 570 | avfilter_graph_free_desc(desc); | ||
| 571 | return -1; | ||
| 572 | } | ||
| 564 | 573 | ||
| 565 | /* Parse supposing there is an (in) element */ | 574 | avfilter_graph_free_desc(desc); |
| 566 | return parse_chain(filters, 1); | 575 | return 0; |
| 567 | } | 576 | } |
| 568 | 577 | ||
| 569 | /** | 578 | /** |
| @@ -72,12 +72,16 @@ typedef struct AVFilterGraph { · 71 unmodified lines | |||
| 72 | } AVFilterGraph; | 72 | } AVFilterGraph; |
| 73 | 73 | ||
| 74 | /** | 74 | /** |
| 75 | * Parse a graph composed of a simple chain of filters which is described by | 75 | * Add to a graph a graph described by a string. |
| 76 | * a single string. | 76 | * @param graph the filter graph where to link the parsed graph context |
| 77 | * @param filters String listing filters and their arguments. | 77 | * @param filters string to be parsed |
| 78 | * @return The parsed graph description. | 78 | * @param in input to the graph to be parsed (TODO: allow several) |
| 79 | * @param inpad pad index of the input | ||
| 80 | * @param in output to the graph to be parsed (TODO: allow several) | ||
| 81 | * @param inpad pad index of the output | ||
| 82 | * @return zero on success, -1 on error | ||
| 79 | */ | 83 | */ |
| 80 | AVFilterGraphDesc *avfilter_graph_parse_chain(const char *filters); | 84 | int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad); |
| 81 | 85 | ||
| 82 | /** | 86 | /** |
| 83 | * Free a filter graph description. | 87 | * Free a filter graph description. |