Commit Graph

54 Commits

Author SHA1 Message Date
Anton Khirnov
38f0c0781a lavfi: merge avfiltergraph.h into avfilter.h
We do not support using filters without AVFilterGraph in practice
anyway, so there is no point in pretending we do.
2013-04-11 20:33:33 +02:00
Anton Khirnov
42c7c61ab2 avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
This is more consistent with the naming in the rest of Libav.
2013-03-16 05:33:23 +01:00
Justin Ruggles
9f1223562e lavfi: connect libavresample options to af_resample via AVFilterGraph 2013-02-23 17:07:54 -05:00
Anton Khirnov
8d900aa4d0 lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft 2012-06-26 13:14:59 +02:00
Stefano Sabatini
91d3cbe0fd avfiltergraph: make the AVFilterInOut alloc/free API public
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-04-14 09:25:46 +02:00
Anton Khirnov
d7bcc71dad graphparser: add avfilter_graph_parse2().
Unlike avfilter_graph_parse(), it returns unlinked inputs and outputs
to the caller, which allows parsing of graphs where inputs/outputs are
not known in advance.
2012-04-14 09:25:46 +02:00
Anton Khirnov
996f9f0c32 avfiltergraph: add an AVClass to AVFilterGraph on next major bump.
It will be used for logging, possibly also AVOptions.
2012-04-01 09:03:35 +02:00
Stefano Sabatini
57fa314090 lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
Require "void *" rather than "AVClass *" for the log context type.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-09-28 08:02:53 +02:00
Diego Biurrun
153382e1b6 multiple inclusion guard cleanup
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
2011-05-21 13:48:10 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Stefano Sabatini
4359288c56 Make avfilter_graph_free() free the graph.
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.

Simplify usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-04 02:55:11 +00:00
Stefano Sabatini
caeb0c3027 Make avfilter_graph_free() do nothing if graph is NULL.
Originally committed as revision 26323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-12 21:23:16 +00:00
Stefano Sabatini
037be76e15 Add avfilter_graph_create_filter().
Originally committed as revision 25862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-02 20:12:27 +00:00
Stefano Sabatini
4fcbb2af33 Prefix with "ff_" the functions:
ff_avfilter_graph_check_validity()
ff_avfilter_graph_config_links()
ff_avfilter_graph_config_formats()

and move their declaration to internal.h. These functions are never
used in application code, so it is better to consider them internal
functions, this can be changed later if necessary. Simplify API.

Originally committed as revision 25737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-13 00:21:28 +00:00
Stefano Sabatini
1e80a0eaa4 Remove graphparser.h header, move AVFilterInOut and
avfilter_graph_parse() declaration to libavfilter/avfiltergraph.h.

Simplify, and less confusing for the user.

Originally committed as revision 25705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-07 22:56:29 +00:00
Stefano Sabatini
97dd1e4a87 Rename avfilter_graph_destroy() to avfilter_graph_free().
The new name is shorter and more consistent with the rest of the API.

This change breaks libavfilter API/ABI.

Originally committed as revision 25674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-04 20:34:24 +00:00
Stefano Sabatini
e15aeea656 Implement avfilter_graph_alloc().
Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-04 20:34:19 +00:00
Stefano Sabatini
2a24df9357 Add avfilter_graph_config().
Originally committed as revision 25502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 10:20:53 +00:00
Diego Biurrun
9a58234fea Fix misspelled parameter names in Doxygen documentation.
This fixes one Doxygen warning each.

Originally committed as revision 23970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 10:49:29 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Stefano Sabatini
bc3c85a3e6 Apply grammar/consistency nits to avfilter_graph_add_filter() doxy.
Originally committed as revision 22842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-11 21:26:00 +00:00
Stefano Sabatini
3fb8e77a8d Add a log context to avfilter_graph_config_links().
Originally committed as revision 21121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 13:39:56 +00:00
Stefano Sabatini
4ec42240ca Implement avfilter_graph_config_links().
Originally committed as revision 19066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 16:30:12 +00:00
Stefano Sabatini
c5c6f62668 Apply documentation fixes: use third person, fix grammar and remove
inconsistent '\p'.

Originally committed as revision 18823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 18:13:17 +00:00
Stefano Sabatini
d7dbe55823 Rename avfilter_destroy_graph() to avfilter_graph_destroy(), for better
consistency with the rest of the API.

Originally committed as revision 17623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:02:09 +00:00
Stefano Sabatini
39c07b8e44 Implement in AVFilterGraph the scale_sws_opts field, and pass its
value in the args for the auto-inserted scale filters.

Originally committed as revision 17547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-23 23:45:21 +00:00
Stefano Sabatini
822005ed45 Implement avfilter_graph_check_validity().
Originally committed as revision 16809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-26 20:21:25 +00:00
Stefano Sabatini
9864142b6d Fix and extend documentation for avfilter_graph_get_filter().
Originally committed as revision 16354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 22:25:47 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
Vitor Sessak
4e4a3e2314 Handle av_realloc() failure
Commited in SoC by Vitor Sessak on 2008-04-04 15:35:38

Originally committed as revision 12754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:09:47 +00:00
Vitor Sessak
10bff7139a Remove declaration of nonexisting function
Commited in SoC by Vitor Sessak on 2008-04-03 16:30:09

Originally committed as revision 12747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:09:29 +00:00
Vitor Sessak
d2027baac5 I should not have merged the graph parser with the graph
framework. Split it.

Commited in SoC by Vitor Sessak on 2008-04-03 16:29:07

Originally committed as revision 12746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:09:27 +00:00
Vitor Sessak
c4913b812d Rename uninit() to avfilter_destroy_graph() and make it non-static
Commited in SoC by Vitor Sessak on 2008-03-27 19:34:24

Originally committed as revision 12742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:09:14 +00:00
Vitor Sessak
0c3177737b Move mess (to be removed) to where it is actually used.
Commited in SoC by Vitor Sessak on 2008-03-26 20:56:05

Originally committed as revision 12739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:09:06 +00:00
Vitor Sessak
87506daafd Remove usage of AVFilterGraphDesc outside avfiltergraph.c
Commited in SoC by Vitor Sessak on 2008-03-26 20:51:24

Originally committed as revision 12738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:09:02 +00:00
Vitor Sessak
9f39bb37e4 Rename variable GraphContext -> AVFilterGraph
Commited in SoC by Vitor Sessak on 2008-03-26 20:31:53

Originally committed as revision 12736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:56 +00:00
Vitor Sessak
f2ee8083c8 Remove avfilter_vf_graph
Commited in SoC by Vitor Sessak on 2008-03-24 20:13:01

Originally committed as revision 12734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:49 +00:00
Vitor Sessak
7264695fe1 Remove more leftovers from the old parser
Commited in SoC by Vitor Sessak on 2008-03-24 19:58:44

Originally committed as revision 12733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:46 +00:00
Vitor Sessak
45a09319b2 Split graph_load_from_dest() to have a version independent of avfilter_vf_graph
Commited in SoC by Vitor Sessak on 2008-03-24 19:19:38

Originally committed as revision 12731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:40 +00:00
Vitor Sessak
b6be4acc1f Remove declaration of non-existing functions
Commited in SoC by Vitor Sessak on 2008-03-24 19:11:27

Originally committed as revision 12730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:37 +00:00
Vitor Sessak
789210fa22 Almost from scratch rewrite of filter parser.
Functional as is, but still work-in-progress in the
sense that some things need to be fixed before sending
it as a patch to SVN.

Commited in SoC by Vitor Sessak on 2008-03-20 21:48:30

Originally committed as revision 12729 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:34 +00:00
Vitor Sessak
3ec394ea82 Remove ugly forward declaration
Commited in SoC by Vitor Sessak on 2008-02-24 11:41:22

Originally committed as revision 12728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:31 +00:00
Vitor Sessak
177ff26052 Spelling and puctuation
Commited in SoC by Vitor Sessak on 2008-02-16 17:52:49

Originally committed as revision 12726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:26 +00:00
Vitor Sessak
c7330a90ef Make comment match code
Commited in SoC by Vitor Sessak on 2008-02-16 17:48:31

Originally committed as revision 12725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:22 +00:00
Vitor Sessak
25a0d98074 Make multiple inclusion guard adhere to convention
Commited in SoC by Vitor Sessak on 2008-02-16 17:48:09

Originally committed as revision 12724 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:08:19 +00:00
Vitor Sessak
d22ebb1b98 Use a filter graph description for creating simple chain graphs so we
can reuse the same graph creation code.

Commited in SoC by Bobby Bingham on 2007-12-22 19:13:04

Originally committed as revision 12715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:07:54 +00:00
Vitor Sessak
16db7fe0ac Make filter graph description parsing code independent of the code to
read said description from a file.

Commited in SoC by Bobby Bingham on 2007-12-22 17:16:21

Originally committed as revision 12714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:07:50 +00:00
Vitor Sessak
7b4708780c Rewrite colorspace negotiation.
Commited in SoC by Bobby Bingham on 2007-12-20 19:36:26

Originally committed as revision 12711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:07:41 +00:00
Vitor Sessak
57d4a1575c Allow creation of filter graphs from a graph description structure which
can be created programmatically or loaded from a file.

Commited in SoC by Bobby Bingham on 2007-08-14 22:27:05

Originally committed as revision 12700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:06:37 +00:00
Vitor Sessak
256d0e0a72 Separate the process of creating links between filters from that of configuring
the links.

Commited in SoC by Bobby Bingham on 2007-08-07 21:02:18

Originally committed as revision 12695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 20:06:22 +00:00