mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
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.
This commit is contained in:
Anton Khirnov
parent
4a37d4b3f8
commit
38f0c0781a
1
avconv.c
1
avconv.c
@ -48,7 +48,6 @@
|
||||
#include "libavformat/os_support.h"
|
||||
|
||||
# include "libavfilter/avfilter.h"
|
||||
# include "libavfilter/avfiltergraph.h"
|
||||
# include "libavfilter/buffersrc.h"
|
||||
# include "libavfilter/buffersink.h"
|
||||
|
||||
|
||||
1
avconv.h
1
avconv.h
@ -36,7 +36,6 @@
|
||||
#include "libavcodec/avcodec.h"
|
||||
|
||||
#include "libavfilter/avfilter.h"
|
||||
#include "libavfilter/avfiltergraph.h"
|
||||
|
||||
#include "libavutil/avutil.h"
|
||||
#include "libavutil/dict.h"
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
#include "avconv.h"
|
||||
|
||||
#include "libavfilter/avfilter.h"
|
||||
#include "libavfilter/avfiltergraph.h"
|
||||
|
||||
#include "libavresample/avresample.h"
|
||||
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
#include "libavcodec/avcodec.h"
|
||||
|
||||
#include "libavfilter/avfilter.h"
|
||||
#include "libavfilter/avfiltergraph.h"
|
||||
|
||||
#include "libavutil/avassert.h"
|
||||
#include "libavutil/avstring.h"
|
||||
|
||||
1
avplay.c
1
avplay.c
@ -41,7 +41,6 @@
|
||||
|
||||
#if CONFIG_AVFILTER
|
||||
# include "libavfilter/avfilter.h"
|
||||
# include "libavfilter/avfiltergraph.h"
|
||||
# include "libavfilter/buffersink.h"
|
||||
# include "libavfilter/buffersrc.h"
|
||||
#endif
|
||||
|
||||
@ -13,6 +13,10 @@ libavutil: 2012-10-22
|
||||
|
||||
API changes, most recent first:
|
||||
|
||||
2013-xx-xx - lavfi 3.8.0
|
||||
Move all content from avfiltergraph.h to avfilter.h. Deprecate
|
||||
avfilterhraph.h, user applications should include just avfilter.h
|
||||
|
||||
2013-xx-xx - lavfi 3.7.0 - avfilter.h
|
||||
Add AVFilter.priv_class for exporting filter options through the AVOptions API
|
||||
in the similar way private options work in lavc and lavf.
|
||||
|
||||
@ -21,7 +21,7 @@ A filtergraph can be represented using a textual representation, which is
|
||||
recognized by the @option{-filter}/@option{-vf} and @option{-filter_complex}
|
||||
options in @command{avconv} and @option{-vf} in @command{avplay}, and by the
|
||||
@code{avfilter_graph_parse()}/@code{avfilter_graph_parse2()} function defined in
|
||||
@file{libavfilter/avfiltergraph.h}.
|
||||
@file{libavfilter/avfilter.h}.
|
||||
|
||||
A filterchain consists of a sequence of connected filters, each one
|
||||
connected to the previous one in the sequence. A filterchain is
|
||||
|
||||
@ -697,4 +697,158 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src);
|
||||
*/
|
||||
const AVClass *avfilter_get_class(void);
|
||||
|
||||
typedef struct AVFilterGraph {
|
||||
const AVClass *av_class;
|
||||
#if FF_API_FOO_COUNT
|
||||
attribute_deprecated
|
||||
unsigned filter_count;
|
||||
#endif
|
||||
AVFilterContext **filters;
|
||||
#if !FF_API_FOO_COUNT
|
||||
unsigned nb_filters;
|
||||
#endif
|
||||
|
||||
char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
|
||||
char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
|
||||
#if FF_API_FOO_COUNT
|
||||
unsigned nb_filters;
|
||||
#endif
|
||||
} AVFilterGraph;
|
||||
|
||||
/**
|
||||
* Allocate a filter graph.
|
||||
*/
|
||||
AVFilterGraph *avfilter_graph_alloc(void);
|
||||
|
||||
/**
|
||||
* Get a filter instance with name name from graph.
|
||||
*
|
||||
* @return the pointer to the found filter instance or NULL if it
|
||||
* cannot be found.
|
||||
*/
|
||||
AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
|
||||
|
||||
/**
|
||||
* Add an existing filter instance to a filter graph.
|
||||
*
|
||||
* @param graphctx the filter graph
|
||||
* @param filter the filter to be added
|
||||
*/
|
||||
int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
|
||||
|
||||
/**
|
||||
* Create and add a filter instance into an existing graph.
|
||||
* The filter instance is created from the filter filt and inited
|
||||
* with the parameters args and opaque.
|
||||
*
|
||||
* In case of success put in *filt_ctx the pointer to the created
|
||||
* filter instance, otherwise set *filt_ctx to NULL.
|
||||
*
|
||||
* @param name the instance name to give to the created filter instance
|
||||
* @param graph_ctx the filter graph
|
||||
* @return a negative AVERROR error code in case of failure, a non
|
||||
* negative value otherwise
|
||||
*/
|
||||
int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
|
||||
const char *name, const char *args, void *opaque,
|
||||
AVFilterGraph *graph_ctx);
|
||||
|
||||
/**
|
||||
* Check validity and configure all the links and formats in the graph.
|
||||
*
|
||||
* @param graphctx the filter graph
|
||||
* @param log_ctx context used for logging
|
||||
* @return 0 in case of success, a negative AVERROR code otherwise
|
||||
*/
|
||||
int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx);
|
||||
|
||||
/**
|
||||
* Free a graph, destroy its links, and set *graph to NULL.
|
||||
* If *graph is NULL, do nothing.
|
||||
*/
|
||||
void avfilter_graph_free(AVFilterGraph **graph);
|
||||
|
||||
/**
|
||||
* A linked-list of the inputs/outputs of the filter chain.
|
||||
*
|
||||
* This is mainly useful for avfilter_graph_parse() / avfilter_graph_parse2(),
|
||||
* where it is used to communicate open (unlinked) inputs and outputs from and
|
||||
* to the caller.
|
||||
* This struct specifies, per each not connected pad contained in the graph, the
|
||||
* filter context and the pad index required for establishing a link.
|
||||
*/
|
||||
typedef struct AVFilterInOut {
|
||||
/** unique name for this input/output in the list */
|
||||
char *name;
|
||||
|
||||
/** filter context associated to this input/output */
|
||||
AVFilterContext *filter_ctx;
|
||||
|
||||
/** index of the filt_ctx pad to use for linking */
|
||||
int pad_idx;
|
||||
|
||||
/** next input/input in the list, NULL if this is the last */
|
||||
struct AVFilterInOut *next;
|
||||
} AVFilterInOut;
|
||||
|
||||
/**
|
||||
* Allocate a single AVFilterInOut entry.
|
||||
* Must be freed with avfilter_inout_free().
|
||||
* @return allocated AVFilterInOut on success, NULL on failure.
|
||||
*/
|
||||
AVFilterInOut *avfilter_inout_alloc(void);
|
||||
|
||||
/**
|
||||
* Free the supplied list of AVFilterInOut and set *inout to NULL.
|
||||
* If *inout is NULL, do nothing.
|
||||
*/
|
||||
void avfilter_inout_free(AVFilterInOut **inout);
|
||||
|
||||
/**
|
||||
* Add a graph described by a string to a graph.
|
||||
*
|
||||
* @param graph the filter graph where to link the parsed graph context
|
||||
* @param filters string to be parsed
|
||||
* @param inputs linked list to the inputs of the graph
|
||||
* @param outputs linked list to the outputs of the graph
|
||||
* @return zero on success, a negative AVERROR code on error
|
||||
*/
|
||||
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
|
||||
AVFilterInOut *inputs, AVFilterInOut *outputs,
|
||||
void *log_ctx);
|
||||
|
||||
/**
|
||||
* Add a graph described by a string to a graph.
|
||||
*
|
||||
* @param[in] graph the filter graph where to link the parsed graph context
|
||||
* @param[in] filters string to be parsed
|
||||
* @param[out] inputs a linked list of all free (unlinked) inputs of the
|
||||
* parsed graph will be returned here. It is to be freed
|
||||
* by the caller using avfilter_inout_free().
|
||||
* @param[out] outputs a linked list of all free (unlinked) outputs of the
|
||||
* parsed graph will be returned here. It is to be freed by the
|
||||
* caller using avfilter_inout_free().
|
||||
* @return zero on success, a negative AVERROR code on error
|
||||
*
|
||||
* @note the difference between avfilter_graph_parse2() and
|
||||
* avfilter_graph_parse() is that in avfilter_graph_parse(), the caller provides
|
||||
* the lists of inputs and outputs, which therefore must be known before calling
|
||||
* the function. On the other hand, avfilter_graph_parse2() \em returns the
|
||||
* inputs and outputs that are left unlinked after parsing the graph and the
|
||||
* caller then deals with them. Another difference is that in
|
||||
* avfilter_graph_parse(), the inputs parameter describes inputs of the
|
||||
* <em>already existing</em> part of the graph; i.e. from the point of view of
|
||||
* the newly created part, they are outputs. Similarly the outputs parameter
|
||||
* describes outputs of the already existing filters, which are provided as
|
||||
* inputs to the parsed filters.
|
||||
* avfilter_graph_parse2() takes the opposite approach -- it makes no reference
|
||||
* whatsoever to already existing parts of the graph and the inputs parameter
|
||||
* will on return contain inputs of the newly parsed part of the graph.
|
||||
* Analogously the outputs parameter will contain outputs of the newly created
|
||||
* filters.
|
||||
*/
|
||||
int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
|
||||
AVFilterInOut **inputs,
|
||||
AVFilterInOut **outputs);
|
||||
|
||||
#endif /* AVFILTER_AVFILTER_H */
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
#include "libavutil/common.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "avfilter.h"
|
||||
#include "avfiltergraph.h"
|
||||
#include "formats.h"
|
||||
#include "internal.h"
|
||||
|
||||
|
||||
@ -25,158 +25,5 @@
|
||||
#include "avfilter.h"
|
||||
#include "libavutil/log.h"
|
||||
|
||||
typedef struct AVFilterGraph {
|
||||
const AVClass *av_class;
|
||||
#if FF_API_FOO_COUNT
|
||||
attribute_deprecated
|
||||
unsigned filter_count;
|
||||
#endif
|
||||
AVFilterContext **filters;
|
||||
#if !FF_API_FOO_COUNT
|
||||
unsigned nb_filters;
|
||||
#endif
|
||||
|
||||
char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters
|
||||
char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
|
||||
#if FF_API_FOO_COUNT
|
||||
unsigned nb_filters;
|
||||
#endif
|
||||
} AVFilterGraph;
|
||||
|
||||
/**
|
||||
* Allocate a filter graph.
|
||||
*/
|
||||
AVFilterGraph *avfilter_graph_alloc(void);
|
||||
|
||||
/**
|
||||
* Get a filter instance with name name from graph.
|
||||
*
|
||||
* @return the pointer to the found filter instance or NULL if it
|
||||
* cannot be found.
|
||||
*/
|
||||
AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
|
||||
|
||||
/**
|
||||
* Add an existing filter instance to a filter graph.
|
||||
*
|
||||
* @param graphctx the filter graph
|
||||
* @param filter the filter to be added
|
||||
*/
|
||||
int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
|
||||
|
||||
/**
|
||||
* Create and add a filter instance into an existing graph.
|
||||
* The filter instance is created from the filter filt and inited
|
||||
* with the parameters args and opaque.
|
||||
*
|
||||
* In case of success put in *filt_ctx the pointer to the created
|
||||
* filter instance, otherwise set *filt_ctx to NULL.
|
||||
*
|
||||
* @param name the instance name to give to the created filter instance
|
||||
* @param graph_ctx the filter graph
|
||||
* @return a negative AVERROR error code in case of failure, a non
|
||||
* negative value otherwise
|
||||
*/
|
||||
int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt,
|
||||
const char *name, const char *args, void *opaque,
|
||||
AVFilterGraph *graph_ctx);
|
||||
|
||||
/**
|
||||
* Check validity and configure all the links and formats in the graph.
|
||||
*
|
||||
* @param graphctx the filter graph
|
||||
* @param log_ctx context used for logging
|
||||
* @return 0 in case of success, a negative AVERROR code otherwise
|
||||
*/
|
||||
int avfilter_graph_config(AVFilterGraph *graphctx, void *log_ctx);
|
||||
|
||||
/**
|
||||
* Free a graph, destroy its links, and set *graph to NULL.
|
||||
* If *graph is NULL, do nothing.
|
||||
*/
|
||||
void avfilter_graph_free(AVFilterGraph **graph);
|
||||
|
||||
/**
|
||||
* A linked-list of the inputs/outputs of the filter chain.
|
||||
*
|
||||
* This is mainly useful for avfilter_graph_parse() / avfilter_graph_parse2(),
|
||||
* where it is used to communicate open (unlinked) inputs and outputs from and
|
||||
* to the caller.
|
||||
* This struct specifies, per each not connected pad contained in the graph, the
|
||||
* filter context and the pad index required for establishing a link.
|
||||
*/
|
||||
typedef struct AVFilterInOut {
|
||||
/** unique name for this input/output in the list */
|
||||
char *name;
|
||||
|
||||
/** filter context associated to this input/output */
|
||||
AVFilterContext *filter_ctx;
|
||||
|
||||
/** index of the filt_ctx pad to use for linking */
|
||||
int pad_idx;
|
||||
|
||||
/** next input/input in the list, NULL if this is the last */
|
||||
struct AVFilterInOut *next;
|
||||
} AVFilterInOut;
|
||||
|
||||
/**
|
||||
* Allocate a single AVFilterInOut entry.
|
||||
* Must be freed with avfilter_inout_free().
|
||||
* @return allocated AVFilterInOut on success, NULL on failure.
|
||||
*/
|
||||
AVFilterInOut *avfilter_inout_alloc(void);
|
||||
|
||||
/**
|
||||
* Free the supplied list of AVFilterInOut and set *inout to NULL.
|
||||
* If *inout is NULL, do nothing.
|
||||
*/
|
||||
void avfilter_inout_free(AVFilterInOut **inout);
|
||||
|
||||
/**
|
||||
* Add a graph described by a string to a graph.
|
||||
*
|
||||
* @param graph the filter graph where to link the parsed graph context
|
||||
* @param filters string to be parsed
|
||||
* @param inputs linked list to the inputs of the graph
|
||||
* @param outputs linked list to the outputs of the graph
|
||||
* @return zero on success, a negative AVERROR code on error
|
||||
*/
|
||||
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
|
||||
AVFilterInOut *inputs, AVFilterInOut *outputs,
|
||||
void *log_ctx);
|
||||
|
||||
/**
|
||||
* Add a graph described by a string to a graph.
|
||||
*
|
||||
* @param[in] graph the filter graph where to link the parsed graph context
|
||||
* @param[in] filters string to be parsed
|
||||
* @param[out] inputs a linked list of all free (unlinked) inputs of the
|
||||
* parsed graph will be returned here. It is to be freed
|
||||
* by the caller using avfilter_inout_free().
|
||||
* @param[out] outputs a linked list of all free (unlinked) outputs of the
|
||||
* parsed graph will be returned here. It is to be freed by the
|
||||
* caller using avfilter_inout_free().
|
||||
* @return zero on success, a negative AVERROR code on error
|
||||
*
|
||||
* @note the difference between avfilter_graph_parse2() and
|
||||
* avfilter_graph_parse() is that in avfilter_graph_parse(), the caller provides
|
||||
* the lists of inputs and outputs, which therefore must be known before calling
|
||||
* the function. On the other hand, avfilter_graph_parse2() \em returns the
|
||||
* inputs and outputs that are left unlinked after parsing the graph and the
|
||||
* caller then deals with them. Another difference is that in
|
||||
* avfilter_graph_parse(), the inputs parameter describes inputs of the
|
||||
* <em>already existing</em> part of the graph; i.e. from the point of view of
|
||||
* the newly created part, they are outputs. Similarly the outputs parameter
|
||||
* describes outputs of the already existing filters, which are provided as
|
||||
* inputs to the parsed filters.
|
||||
* avfilter_graph_parse2() takes the opposite approach -- it makes no reference
|
||||
* whatsoever to already existing parts of the graph and the inputs parameter
|
||||
* will on return contain inputs of the newly parsed part of the graph.
|
||||
* Analogously the outputs parameter will contain outputs of the newly created
|
||||
* filters.
|
||||
*/
|
||||
int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters,
|
||||
AVFilterInOut **inputs,
|
||||
AVFilterInOut **outputs);
|
||||
|
||||
#endif /* AVFILTER_AVFILTERGRAPH_H */
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
#include "libavutil/avstring.h"
|
||||
#include "libavutil/mem.h"
|
||||
#include "avfilter.h"
|
||||
#include "avfiltergraph.h"
|
||||
|
||||
#define WHITESPACES " \n\t"
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#include "libavutil/avutil.h"
|
||||
|
||||
#define LIBAVFILTER_VERSION_MAJOR 3
|
||||
#define LIBAVFILTER_VERSION_MINOR 7
|
||||
#define LIBAVFILTER_VERSION_MINOR 8
|
||||
#define LIBAVFILTER_VERSION_MICRO 0
|
||||
|
||||
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#include "libavutil/mem.h"
|
||||
#include "libavutil/pixdesc.h"
|
||||
#include "libavutil/audioconvert.h"
|
||||
#include "libavfilter/avfiltergraph.h"
|
||||
#include "libavfilter/avfilter.h"
|
||||
|
||||
#if !HAVE_GETOPT
|
||||
#include "compat/getopt.c"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user