[FFmpeg-soc] [soc]: r2081 - in libavfilter: avfiltergraph.c avfiltergraph.h diffs/04_ffmpeg_filters.diff graphparser.c graphparser.h
vitor
subversion at mplayerhq.hu
Thu Apr 3 18:29:08 CEST 2008
Author: vitor
Date: Thu Apr 3 18:29:07 2008
New Revision: 2081
Log:
I should not have merged the graph parser with the graph
framework. Split it.
Added:
libavfilter/graphparser.c
- copied, changed from r2061, /libavfilter/avfiltergraph.c
libavfilter/graphparser.h
- copied, changed from r2055, /libavfilter/avfiltergraph.h
Modified:
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/diffs/04_ffmpeg_filters.diff
Modified: libavfilter/avfiltergraph.c
==============================================================================
--- libavfilter/avfiltergraph.c (original)
+++ libavfilter/avfiltergraph.c Thu Apr 3 18:29:07 2008
@@ -26,21 +26,6 @@
#include "avfilter.h"
#include "avfiltergraph.h"
-/**
- * For use in av_log
- */
-static const char *log_name(void *p)
-{
- return "Filter parser";
-}
-
-static const AVClass filter_parser_class = {
- "Filter parser",
- log_name
-};
-
-static const AVClass *log_ctx = &filter_parser_class;
-
void avfilter_destroy_graph(AVFilterGraph *graph)
{
for(; graph->filter_count > 0; graph->filter_count --)
@@ -48,7 +33,9 @@ void avfilter_destroy_graph(AVFilterGrap
av_freep(&graph->filters);
}
-/* TODO: insert in sorted order */
+/**
+ * @todo insert in sorted order
+ */
void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
{
graph->filters = av_realloc(graph->filters,
@@ -56,7 +43,9 @@ void avfilter_graph_add_filter(AVFilterG
graph->filters[graph->filter_count - 1] = filter;
}
-/* search intelligently, once we insert in order */
+/*
+ * @todo search intelligently, once we insert in order
+ */
AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
{
int i;
@@ -160,347 +149,3 @@ int avfilter_graph_config_formats(AVFilt
return 0;
}
-static int create_filter(AVFilterGraph *ctx, int index, char *name,
- char *args)
-{
- AVFilterContext *filt;
-
- AVFilter *filterdef;
- char tmp[20];
-
- snprintf(tmp, 20, "%d", index);
- if(!(filterdef = avfilter_get_by_name(name)) ||
- !(filt = avfilter_open(filterdef, tmp))) {
- av_log(&log_ctx, AV_LOG_ERROR,
- "error creating filter '%s'\n", name);
- return -1;
- }
- avfilter_graph_add_filter(ctx, filt);
- if(avfilter_init_filter(filt, args, NULL)) {
- av_log(&log_ctx, AV_LOG_ERROR,
- "error initializing filter '%s'\n", name);
- return -1;
- }
-
- return 0;
-}
-
-static int link_filter(AVFilterGraph *ctx, int src, int srcpad,
- int dst, int dstpad)
-{
- AVFilterContext *filt, *filtb;
-
- char tmp[20];
-
- snprintf(tmp, 20, "%d", src);
- if(!(filt = avfilter_graph_get_filter(ctx, tmp))) {
- av_log(&log_ctx, AV_LOG_ERROR, "link source does not exist in graph\n");
- return -1;
- }
- snprintf(tmp, 20, "%d", dst);
- if(!(filtb = avfilter_graph_get_filter(ctx, tmp))) {
- av_log(&log_ctx, AV_LOG_ERROR, "link destination does not exist in graph\n");
- return -1;
- }
- if(avfilter_link(filt, srcpad, filtb, dstpad)) {
- av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
- return -1;
- }
-
- return 0;
-}
-
-static void consume_whitespace(const char **buf)
-{
- *buf += strspn(*buf, " \n\t");
-}
-
-/**
- * Copy the first size bytes of input string to a null-terminated string,
- * removing any control character. Ex: "aaa'bb'c\'c\\" -> "aaabbc'c\"
- */
-static void copy_unquoted(char *out, const char *in, int size)
-{
- int i;
- for (i=0; i < size; i++) {
- if (in[i] == '\'')
- continue;
- else if (in[i] == '\\') {
- if (i+1 == size) {
- *out = 0;
- return;
- }
- i++;
- }
- *out++ = in[i];
- }
- *out=0;
-}
-
-/**
- * Consumes a string from *buf.
- * @return a copy of the consumed string, which should be free'd after use
- */
-static char *consume_string(const char **buf)
-{
- const char *start;
- char *ret;
- int size;
-
- consume_whitespace(buf);
-
- if (!(**buf))
- return av_mallocz(1);
-
- start = *buf;
-
- while(1) {
- *buf += strcspn(*buf, " ()=,'\\");
- if (**buf == '\\')
- *buf+=2;
- else
- break;
- }
-
- if (**buf == '\'') {
- const char *p = *buf;
- do {
- p++;
- p = strchr(p, '\'');
- } while (p && p[-1] == '\\');
- if (p)
- *buf = p + 1;
- else
- *buf += strlen(*buf); // Move the pointer to the null end byte
- }
-
- size = *buf - start + 1;
- ret = av_malloc(size);
- copy_unquoted(ret, start, size-1);
-
- return ret;
-}
-
-/**
- * Parse "(linkname)"
- * @arg name a pointer (that need to be free'd after use) to the name between
- * parenthesis
- */
-static void parse_link_name(const char **buf, char **name)
-{
- (*buf)++;
-
- *name = consume_string(buf);
-
- if (!*name[0])
- goto fail;
-
- if (*(*buf)++ != ')')
- goto fail;
-
- return;
- fail:
- av_freep(name);
- av_log(&log_ctx, AV_LOG_ERROR, "Could not parse link name!\n");
-}
-
-/**
- * Parse "filter=params"
- * @arg name a pointer (that need to be free'd after use) to the name of the
- * filter
- * @arg ars a pointer (that need to be free'd after use) to the args of the
- * filter
- */
-static int parse_filter(const char **buf, AVFilterGraph *graph, int index)
-{
- char *name, *opts;
- name = consume_string(buf);
-
- if (**buf == '=') {
- (*buf)++;
- opts = consume_string(buf);
- } else {
- opts = NULL;
- }
-
- return create_filter(graph, index, name, opts);
-}
-
-enum LinkType {
- LinkTypeIn,
- LinkTypeOut,
-};
-
-/**
- * A linked-list of the inputs/outputs of the filter chain.
- */
-typedef struct AVFilterInOut {
- enum LinkType type;
- char *name;
- int instance;
- int pad_idx;
-
- struct AVFilterInOut *next;
-} AVFilterInOut;
-
-static void free_inout(AVFilterInOut *head)
-{
- while (head) {
- AVFilterInOut *next;
- next = head->next;
- av_free(head);
- head = next;
- }
-}
-
-/**
- * Parse "(a1)(link2) ... (etc)"
- */
-static int parse_inouts(const char **buf, AVFilterInOut **inout, int firstpad,
- enum LinkType type, int instance)
-{
- int pad = firstpad;
- while (**buf == '(') {
- AVFilterInOut *inoutn = av_malloc(sizeof(AVFilterInOut));
- parse_link_name(buf, &inoutn->name);
- inoutn->type = type;
- inoutn->instance = instance;
- inoutn->pad_idx = pad++;
- inoutn->next = *inout;
- *inout = inoutn;
- }
- return pad;
-}
-
-/**
- * Parse a string describing a filter graph.
- */
-int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad)
-{
- AVFilterInOut *inout=NULL;
- AVFilterInOut *head=NULL;
-
- int index = 0;
- char chr = 0;
- int pad = 0;
- int has_out = 0;
-
- char tmp[20];
- AVFilterContext *filt;
-
- consume_whitespace(&filters);
-
- do {
- int oldpad = pad;
-
- pad = parse_inouts(&filters, &inout, chr == ',', LinkTypeIn, index);
-
- if (parse_filter(&filters, graph, index) < 0)
- goto fail;
-
- // If the first filter has an input and none was given, it is
- // implicitly the input of the whole graph.
- if (pad == 0 && graph->filters[graph->filter_count-1]->input_count == 1) {
- snprintf(tmp, 20, "%d", index);
- if(!(filt = avfilter_graph_get_filter(graph, tmp))) {
- av_log(&log_ctx, AV_LOG_ERROR, "filter owning exported pad does not exist\n");
- goto fail;
- }
- if(avfilter_link(in, inpad, filt, 0)) {
- av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
- goto fail;
- }
- }
-
- if(chr == ',') {
- if (link_filter(graph, index-1, oldpad, index, 0) < 0)
- goto fail;
-
- }
- pad = parse_inouts(&filters, &inout, 0, LinkTypeOut, index);
- chr = *filters++;
- index++;
- } while (chr == ',' || chr == ';');
-
- head = inout;
- for (; inout != NULL; inout = inout->next) {
- if (inout->instance == -1)
- continue; // Already processed
-
- if (!strcmp(inout->name, "in")) {
- snprintf(tmp, 20, "%d", inout->instance);
- if(!(filt = avfilter_graph_get_filter(graph, tmp))) {
- av_log(&log_ctx, AV_LOG_ERROR, "filter owning exported pad does not exist\n");
- goto fail;
- }
- if(avfilter_link(in, inpad, filt, inout->pad_idx)) {
- av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
- goto fail;
- }
- } else if (!strcmp(inout->name, "out")) {
- has_out = 1;
- snprintf(tmp, 20, "%d", inout->instance);
- if(!(filt = avfilter_graph_get_filter(graph, tmp))) {
- av_log(&log_ctx, AV_LOG_ERROR, "filter owning exported pad does not exist\n");
- goto fail;
- }
-
- if(avfilter_link(filt, inout->pad_idx, out, outpad)) {
- av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
- goto fail;
- }
-
- } else {
- AVFilterInOut *p, *src, *dst;
- for (p = inout->next;
- p && strcmp(p->name,inout->name); p = p->next);
-
- if (!p) {
- av_log(&log_ctx, AV_LOG_ERROR, "Unmatched link: %s.\n",
- inout->name);
- goto fail;
- }
-
- if (p->type == LinkTypeIn && inout->type == LinkTypeOut) {
- src = inout;
- dst = p;
- } else if (p->type == LinkTypeOut && inout->type == LinkTypeIn) {
- src = p;
- dst = inout;
- } else {
- av_log(&log_ctx, AV_LOG_ERROR, "Two links named '%s' are either both input or both output\n",
- inout->name);
- goto fail;
- }
-
- if (link_filter(graph, src->instance, src->pad_idx, dst->instance, dst->pad_idx) < 0)
- goto fail;
-
- src->instance = -1;
- dst->instance = -1;
- }
- }
-
- free_inout(head);
-
- if (!has_out) {
- snprintf(tmp, 20, "%d", index-1);
- if(!(filt = avfilter_graph_get_filter(graph, tmp))) {
- av_log(&log_ctx, AV_LOG_ERROR, "filter owning exported pad does not exist\n");
- goto fail;
- }
-
- if(avfilter_link(filt, pad, out, outpad)) {
- av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n");
- goto fail;
- }
-
- }
-
- return 0;
-
- fail:
- free_inout(head);
- avfilter_destroy_graph(graph);
- return -1;
-}
Modified: libavfilter/avfiltergraph.h
==============================================================================
--- libavfilter/avfiltergraph.h (original)
+++ libavfilter/avfiltergraph.h Thu Apr 3 18:29:07 2008
@@ -30,16 +30,9 @@ typedef struct AVFilterGraph {
} AVFilterGraph;
/**
- * Add to a graph a graph described by a string.
- * @param graph the filter graph where to link the parsed graph context
- * @param filters string to be parsed
- * @param in input to the graph to be parsed (TODO: allow several)
- * @param inpad pad index of the input
- * @param in output to the graph to be parsed (TODO: allow several)
- * @param inpad pad index of the output
- * @return zero on success, -1 on error
+ * Get a pointer to a graph by instance name
*/
-int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad);
+AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name);
/**
* Add an existing filter instance to a filter graph.
Modified: libavfilter/diffs/04_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/04_ffmpeg_filters.diff (original)
+++ libavfilter/diffs/04_ffmpeg_filters.diff Thu Apr 3 18:29:07 2008
@@ -2,19 +2,20 @@ Index: ffmpeg.c
===================================================================
--- ffmpeg.c (revision 12379)
+++ ffmpeg.c (working copy)
-@@ -36,6 +36,11 @@
+@@ -36,6 +36,12 @@
#include "avstring.h"
#include "os_support.h"
+#if ENABLE_AVFILTER
+# include "avfilter.h"
+# include "avfiltergraph.h"
++# include "graphparser.h"
+#endif
+
#if !defined(HAVE_GETRUSAGE) && defined(HAVE_GETPROCESSTIMES)
#include <windows.h>
#endif
-@@ -135,6 +140,9 @@
+@@ -135,6 +141,9 @@
static int loop_input = 0;
static int loop_output = AVFMT_NOOUTPUTLOOP;
static int qp_hist = 0;
@@ -24,7 +25,7 @@ Index: ffmpeg.c
static int intra_only = 0;
static int audio_sample_rate = 44100;
-@@ -273,6 +281,13 @@
+@@ -273,6 +282,13 @@
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
@@ -38,7 +39,7 @@ Index: ffmpeg.c
} AVInputStream;
typedef struct AVInputFile {
-@@ -288,6 +303,254 @@
+@@ -288,6 +304,254 @@
static struct termios oldtty;
#endif
@@ -293,7 +294,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#ifdef HAVE_TERMIOS_H
-@@ -754,6 +1017,9 @@
+@@ -754,6 +1018,9 @@
if (nb_frames <= 0)
return;
@@ -303,7 +304,7 @@ Index: ffmpeg.c
if (ost->video_crop) {
if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) {
av_log(NULL, AV_LOG_ERROR, "error cropping picture\n");
-@@ -763,6 +1029,7 @@
+@@ -763,6 +1030,7 @@
} else {
formatted_picture = in_picture;
}
@@ -311,7 +312,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -778,12 +1045,14 @@
+@@ -778,12 +1046,14 @@
}
}
@@ -326,7 +327,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1053,6 +1322,7 @@
+@@ -1053,6 +1323,7 @@
static short *samples= NULL;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -334,7 +335,7 @@ Index: ffmpeg.c
if(ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts;
-@@ -1165,6 +1435,17 @@
+@@ -1165,6 +1436,17 @@
&buffer_to_free);
}
@@ -352,7 +353,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1202,9 +1483,16 @@
+@@ -1202,9 +1484,16 @@
}
}
#endif
@@ -369,7 +370,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1227,6 +1515,9 @@
+@@ -1227,6 +1516,9 @@
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
@@ -379,7 +380,7 @@ Index: ffmpeg.c
do_video_out(os, ost, ist, &picture, &frame_size);
video_size += frame_size;
if (vstats_filename && frame_size)
-@@ -1285,7 +1576,15 @@
+@@ -1285,7 +1577,15 @@
av_free_packet(&opkt);
}
}
@@ -395,7 +396,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1693,10 +1992,21 @@
+@@ -1693,10 +1993,21 @@
fprintf(stderr, "Cannot get resampling context\n");
exit(1);
}
@@ -417,7 +418,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -3804,6 +4114,9 @@
+@@ -3804,6 +4115,9 @@
#ifdef CONFIG_VHOOK
{ "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
#endif
Copied: libavfilter/graphparser.c (from r2061, /libavfilter/avfiltergraph.c)
==============================================================================
--- /libavfilter/avfiltergraph.c (original)
+++ libavfilter/graphparser.c Thu Apr 3 18:29:07 2008
@@ -1,5 +1,5 @@
/*
- * filter graphs
+ * filter graph parser
* copyright (c) 2008 Vitor Sessak
* copyright (c) 2007 Bobby Bingham
*
@@ -41,125 +41,6 @@ static const AVClass filter_parser_class
static const AVClass *log_ctx = &filter_parser_class;
-void avfilter_destroy_graph(AVFilterGraph *graph)
-{
- for(; graph->filter_count > 0; graph->filter_count --)
- avfilter_destroy(graph->filters[graph->filter_count - 1]);
- av_freep(&graph->filters);
-}
-
-/* TODO: insert in sorted order */
-void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
-{
- graph->filters = av_realloc(graph->filters,
- sizeof(AVFilterContext*) * ++graph->filter_count);
- graph->filters[graph->filter_count - 1] = filter;
-}
-
-/* search intelligently, once we insert in order */
-AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name)
-{
- int i;
-
- if(!name)
- return NULL;
-
- for(i = 0; i < graph->filter_count; i ++)
- if(graph->filters[i]->name && !strcmp(name, graph->filters[i]->name))
- return graph->filters[i];
-
- return NULL;
-}
-
-static int query_formats(AVFilterGraph *graph)
-{
- int i, j;
-
- /* ask all the sub-filters for their supported colorspaces */
- for(i = 0; i < graph->filter_count; i ++) {
- if(graph->filters[i]->filter->query_formats)
- graph->filters[i]->filter->query_formats(graph->filters[i]);
- else
- avfilter_default_query_formats(graph->filters[i]);
- }
-
- /* go through and merge as many format lists as possible */
- for(i = 0; i < graph->filter_count; i ++) {
- AVFilterContext *filter = graph->filters[i];
-
- for(j = 0; j < filter->input_count; j ++) {
- AVFilterLink *link;
- if(!(link = filter->inputs[j]))
- continue;
- if(link->in_formats != link->out_formats) {
- if(!avfilter_merge_formats(link->in_formats,
- link->out_formats)) {
- /* couldn't merge format lists. auto-insert scale filter */
- AVFilterContext *scale;
-
- if(!(scale =
- avfilter_open(avfilter_get_by_name("scale"), NULL)))
- return -1;
- if(scale->filter->init(scale, NULL, NULL) ||
- avfilter_insert_filter(link, scale, 0, 0)) {
- avfilter_destroy(scale);
- return -1;
- }
-
- avfilter_graph_add_filter(graph, scale);
- scale->filter->query_formats(scale);
- if(!avfilter_merge_formats(scale-> inputs[0]->in_formats,
- scale-> inputs[0]->out_formats) ||
- !avfilter_merge_formats(scale->outputs[0]->in_formats,
- scale->outputs[0]->out_formats))
- return -1;
- }
- }
- }
- }
-
- return 0;
-}
-
-static void pick_format(AVFilterLink *link)
-{
- if(!link || !link->in_formats)
- return;
-
- link->in_formats->format_count = 1;
- link->format = link->in_formats->formats[0];
-
- avfilter_formats_unref(&link->in_formats);
- avfilter_formats_unref(&link->out_formats);
-}
-
-static void pick_formats(AVFilterGraph *graph)
-{
- int i, j;
-
- for(i = 0; i < graph->filter_count; i ++) {
- AVFilterContext *filter = graph->filters[i];
-
- for(j = 0; j < filter->input_count; j ++)
- pick_format(filter->inputs[j]);
- for(j = 0; j < filter->output_count; j ++)
- pick_format(filter->outputs[j]);
- }
-}
-
-int avfilter_graph_config_formats(AVFilterGraph *graph)
-{
- /* find supported formats from sub-filters, and merge along links */
- if(query_formats(graph))
- return -1;
-
- /* Once everything is merged, it's possible that we'll still have
- * multiple valid colorspace choices. We pick the first one. */
- pick_formats(graph);
-
- return 0;
-}
-
static int create_filter(AVFilterGraph *ctx, int index, char *name,
char *args)
{
Copied: libavfilter/graphparser.h (from r2055, /libavfilter/avfiltergraph.h)
==============================================================================
--- /libavfilter/avfiltergraph.h (original)
+++ libavfilter/graphparser.h Thu Apr 3 18:29:07 2008
@@ -1,5 +1,5 @@
/*
- * Filter graphs
+ * Filter graph parser
* copyright (c) 2007 Bobby Bingham
*
* This file is part of FFmpeg.
@@ -19,15 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef FFMPEG_AVFILTERGRAPH_H
-#define FFMPEG_AVFILTERGRAPH_H
+#ifndef FFMPEG_GRAPHPARSER_H
+#define FFMPEG_GRAPHPARSER_H
#include "avfilter.h"
-
-typedef struct AVFilterGraph {
- unsigned filter_count;
- AVFilterContext **filters;
-} AVFilterGraph;
+#include "avfiltergraph.h"
/**
* Add to a graph a graph described by a string.
@@ -41,26 +37,4 @@ typedef struct AVFilterGraph {
*/
int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad);
-/**
- * Add an existing filter instance to a filter graph.
- * @param graph The filter graph
- * @param filter The filter to be added
- */
-void avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter);
-
-/**
- * Configure the formats of all the links in the graph.
- */
-int avfilter_graph_config_formats(AVFilterGraph *graphctx);
-
-/**
- * Configure the parameters (resolution, etc) of all links in the graph.
- */
-int avfilter_graph_config_links(AVFilterGraph *graphctx);
-
-/**
- * Free a graph and destroy its links.
- */
-void avfilter_destroy_graph(AVFilterGraph *graph);
-
-#endif /* FFMPEG_AVFILTERGRAPH_H */
+#endif /* FFMPEG_GRAPHPARSER_H */
More information about the FFmpeg-soc
mailing list