diff options
author | Stefano Sabatini <stefasab@gmail.com> | 2012-10-23 03:13:23 +0400 |
---|---|---|
committer | Stefano Sabatini <stefasab@gmail.com> | 2012-10-24 00:08:55 +0400 |
commit | 8b03cd3cd7a3141b87419ebce02b9fed7e0030da (patch) | |
tree | aeedf357352b667519c7744cdbfeaea58017d272 | |
parent | bd6240e7e9f3d60b542fd517742fd546318f5917 (diff) |
lavd/lavfi: add graph_file option
Allow to specify a filename where to put the filtergraph description.
This is useful to override limitations or glitches of particular shell
environments, and allows a level of indirection for specifying
filtergraphs.
-rw-r--r-- | doc/indevs.texi | 6 | ||||
-rw-r--r-- | libavdevice/lavfi.c | 29 | ||||
-rw-r--r-- | libavfilter/version.h | 2 |
3 files changed, 36 insertions, 1 deletions
diff --git a/doc/indevs.texi b/doc/indevs.texi index a5a91fa933..8ac102b274 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -320,6 +320,12 @@ label, but all the others need to be specified explicitly. If not specified defaults to the filename specified for the input device. + +@item graph_file +Set the filename of the filtergraph to be read and sent to the other +filters. Syntax of the filtergraph is the same as the one specified by +the option @var{graph}. + @end table @subsection Examples diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 82c5844fab..070aff565c 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -28,6 +28,7 @@ #include "float.h" /* DBL_MIN, DBL_MAX */ #include "libavutil/bprint.h" +#include "libavutil/file.h" #include "libavutil/log.h" #include "libavutil/mem.h" #include "libavutil/opt.h" @@ -43,6 +44,7 @@ typedef struct { AVClass *class; ///< class for private options char *graph_str; + char *graph_filename; char *dump_graph; AVFilterGraph *graph; AVFilterContext **sinks; @@ -104,6 +106,32 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) buffersink = avfilter_get_by_name("ffbuffersink"); abuffersink = avfilter_get_by_name("ffabuffersink"); + if (lavfi->graph_filename && lavfi->graph_str) { + av_log(avctx, AV_LOG_ERROR, + "Only one of the graph or graph_file options must be specified\n"); + return AVERROR(EINVAL); + } + + if (lavfi->graph_filename) { + uint8_t *file_buf, *graph_buf; + size_t file_bufsize; + ret = av_file_map(lavfi->graph_filename, + &file_buf, &file_bufsize, 0, avctx); + if (ret < 0) + return ret; + + /* create a 0-terminated string based on the read file */ + graph_buf = av_malloc(file_bufsize + 1); + if (!graph_buf) { + av_file_unmap(file_buf, file_bufsize); + return AVERROR(ENOMEM); + } + memcpy(graph_buf, file_buf, file_bufsize); + graph_buf[file_bufsize] = 0; + av_file_unmap(file_buf, file_bufsize); + lavfi->graph_str = graph_buf; + } + if (!lavfi->graph_str) lavfi->graph_str = av_strdup(avctx->filename); @@ -376,6 +404,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) static const AVOption options[] = { { "graph", "set libavfilter graph", OFFSET(graph_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, + { "graph_file","set libavfilter graph filename", OFFSET(graph_filename), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC}, { "dumpgraph", "dump graph to stderr", OFFSET(dump_graph), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { NULL }, }; diff --git a/libavfilter/version.h b/libavfilter/version.h index 534027b461..672472bd89 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 20 -#define LIBAVFILTER_VERSION_MICRO 104 +#define LIBAVFILTER_VERSION_MICRO 105 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |