[FFmpeg-soc] [soc]: r2206 - in libavfilter: diffs/04_ffmpeg_filters.diff graphparser.c graphparser.h
vitor
subversion at mplayerhq.hu
Sat May 24 19:20:09 CEST 2008
Author: vitor
Date: Sat May 24 19:20:09 2008
New Revision: 2206
Log:
Split openLinks linked list into openInputs and openOutputs
Modified:
libavfilter/diffs/04_ffmpeg_filters.diff
libavfilter/graphparser.c
libavfilter/graphparser.h
Modified: libavfilter/diffs/04_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/04_ffmpeg_filters.diff (original)
+++ libavfilter/diffs/04_ffmpeg_filters.diff Sat May 24 19:20:09 2008
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 12379)
+--- ffmpeg.c (revision 12891)
+++ ffmpeg.c (working copy)
@@ -36,6 +36,12 @@
#include "avstring.h"
@@ -215,7 +215,7 @@ Index: ffmpeg.c
+
+ avfilter_register_all();
+
-+ if(!(ist->input_video_filter = avfilter_open(&input_filter, "src")))
++ if(!(ist->input_video_filter = avfilter_open(&input_filter, "src")))
+ return -1;
+ if(!(ist->out_video_filter = avfilter_open(&output_filter, "out")))
+ return -1;
@@ -270,20 +270,20 @@ Index: ffmpeg.c
+ }
+
+ if(vfilters) {
-+ AVFilterInOut *inouts = av_malloc(sizeof(AVFilterInOut));
-+ inouts->name = "in";
-+ inouts->filter = curr_filter;
-+ inouts->type = LinkTypeOut;
-+ inouts->pad_idx = 0;
-+ inouts->next = av_malloc(sizeof(AVFilterInOut));
++ AVFilterInOut *outputs = av_malloc(sizeof(AVFilterInOut));
++ AVFilterInOut *inputs = av_malloc(sizeof(AVFilterInOut));
+
-+ inouts->next->name = "out";
-+ inouts->next->filter = ist->out_video_filter;
-+ inouts->next->type = LinkTypeIn;
-+ inouts->next->pad_idx = 0;
-+ inouts->next->next = NULL;
++ outputs->name = av_strdup("in");
++ outputs->filter = curr_filter;
++ outputs->pad_idx = 0;
++ outputs->next = NULL;
+
-+ if (avfilter_parse_graph(filt_graph_all, vfilters, inouts, NULL) < 0)
++ inputs->name = av_strdup("out");
++ inputs->filter = ist->out_video_filter;
++ inputs->pad_idx = 0;
++ inputs->next = NULL;
++
++ if (avfilter_parse_graph(filt_graph_all, vfilters, inputs, outputs, NULL) < 0)
+ return -1;
+ } else {
+ if(avfilter_link(curr_filter, 0, ist->out_video_filter, 0) < 0)
@@ -306,7 +306,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#ifdef HAVE_TERMIOS_H
-@@ -754,6 +1030,9 @@
+@@ -807,6 +1083,9 @@
if (nb_frames <= 0)
return;
@@ -316,7 +316,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 +1042,7 @@
+@@ -816,6 +1095,7 @@
} else {
formatted_picture = in_picture;
}
@@ -324,7 +324,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -778,12 +1058,14 @@
+@@ -831,12 +1111,14 @@
}
}
@@ -339,7 +339,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1053,6 +1335,7 @@
+@@ -1106,6 +1388,7 @@
static short *samples= NULL;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -347,7 +347,7 @@ Index: ffmpeg.c
if(ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts;
-@@ -1165,6 +1448,17 @@
+@@ -1218,6 +1501,17 @@
&buffer_to_free);
}
@@ -365,7 +365,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1202,9 +1496,16 @@
+@@ -1255,9 +1549,16 @@
}
}
#endif
@@ -382,7 +382,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1227,6 +1528,9 @@
+@@ -1280,6 +1581,9 @@
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
@@ -392,7 +392,7 @@ Index: ffmpeg.c
do_video_out(os, ost, ist, &picture, &frame_size);
video_size += frame_size;
if (vstats_filename && frame_size)
-@@ -1285,7 +1589,15 @@
+@@ -1338,7 +1642,15 @@
av_free_packet(&opkt);
}
}
@@ -408,9 +408,9 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1693,10 +2005,21 @@
+@@ -1746,10 +2058,21 @@
fprintf(stderr, "Cannot get resampling context\n");
- exit(1);
+ av_exit(1);
}
+#if ENABLE_AVFILTER
+ ost->resample_height = icodec->height;
@@ -430,7 +430,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -3804,6 +4127,9 @@
+@@ -3850,6 +4173,9 @@
#ifdef CONFIG_VHOOK
{ "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
#endif
Modified: libavfilter/graphparser.c
==============================================================================
--- libavfilter/graphparser.c (original)
+++ libavfilter/graphparser.c Sat May 24 19:20:09 2008
@@ -212,7 +212,7 @@ static void insert_inout(AVFilterInOut *
static int link_filter_inouts(AVFilterContext *filter,
AVFilterInOut **currInputs,
- AVFilterInOut **openLinks, AVClass *log_ctx)
+ AVFilterInOut **openInputs, AVClass *log_ctx)
{
int pad = filter->input_count;
@@ -249,7 +249,6 @@ static int link_filter_inouts(AVFilterCo
pad = filter->output_count;
while(pad--) {
AVFilterInOut *currlinkn = av_mallocz(sizeof(AVFilterInOut));
- currlinkn->type = LinkTypeOut;
currlinkn->filter = filter;
currlinkn->pad_idx = pad;
insert_inout(currInputs, currlinkn);
@@ -259,7 +258,7 @@ static int link_filter_inouts(AVFilterCo
}
static int parse_inputs(const char **buf, AVFilterInOut **currInputs,
- AVFilterInOut **openLinks, AVClass *log_ctx)
+ AVFilterInOut **openOutputs, AVClass *log_ctx)
{
int pad = 0;
@@ -270,23 +269,15 @@ static int parse_inputs(const char **buf
if(!name)
return -1;
- /* First check if the label is not in the openLinks list */
- match = extract_inout(name, openLinks);
+ /* First check if the label is not in the openOutputs list */
+ match = extract_inout(name, openOutputs);
if(match) {
- /* A label of a open link. Make it one of the inputs of the next
- filter */
- if(match->type != LinkTypeOut) {
- av_log(log_ctx, AV_LOG_ERROR,
- "Label \"%s\" appears twice as input!\n", match->name);
- return -1;
- }
av_free(name);
} else {
/* Not in the list, so add it as an input */
match = av_mallocz(sizeof(AVFilterInOut));
match->name = name;
- match->type = LinkTypeIn;
match->pad_idx = pad;
}
@@ -300,7 +291,8 @@ static int parse_inputs(const char **buf
}
static int parse_outputs(const char **buf, AVFilterInOut **currInputs,
- AVFilterInOut **openLinks, AVClass *log_ctx)
+ AVFilterInOut **openInputs,
+ AVFilterInOut **openOutputs, AVClass *log_ctx)
{
int pad = 0;
@@ -314,17 +306,10 @@ static int parse_outputs(const char **bu
if(!name)
return -1;
- /* First check if the label is not in the openLinks list */
- match = extract_inout(name, openLinks);
+ /* First check if the label is not in the openInputs list */
+ match = extract_inout(name, openInputs);
if(match) {
- /* A label of a open link. Link it. */
- if(match->type != LinkTypeIn) {
- av_log(log_ctx, AV_LOG_ERROR,
- "Label \"%s\" appears twice as output!\n", match->name);
- return -1;
- }
-
if(link_filter(input->filter, input->pad_idx,
match->filter, match->pad_idx, log_ctx) < 0)
return -1;
@@ -333,9 +318,7 @@ static int parse_outputs(const char **bu
av_free(match);
av_free(input);
} else {
- /* Not in the list, so add the first input as a openLink */
- input->next = *openLinks;
- input->type = LinkTypeOut;
+ /* Not in the list, so add the first input as a openOutput */
input->name = name;
insert_inout(openOutputs, input);
}
@@ -347,7 +330,8 @@ static int parse_outputs(const char **bu
}
int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
- AVFilterInOut *openLinks, AVClass *log_ctx)
+ AVFilterInOut *openInputs,
+ AVFilterInOut *openOutputs, AVClass *log_ctx)
{
int index = 0;
char chr = 0;
@@ -358,7 +342,7 @@ int avfilter_parse_graph(AVFilterGraph *
AVFilterContext *filter;
filters += consume_whitespace(filters);
- if(parse_inputs(&filters, &currInputs, &openLinks, log_ctx) < 0)
+ if(parse_inputs(&filters, &currInputs, &openOutputs, log_ctx) < 0)
goto fail;
filter = parse_filter(&filters, graph, index, log_ctx);
@@ -369,14 +353,15 @@ int avfilter_parse_graph(AVFilterGraph *
if(filter->input_count == 1 && !currInputs && !index) {
/* First input can be ommitted if it is "[in]" */
const char *tmp = "[in]";
- if(parse_inputs(&tmp, &currInputs, &openLinks, log_ctx))
+ if(parse_inputs(&tmp, &currInputs, &openOutputs, log_ctx) < 0)
goto fail;
}
- if(link_filter_inouts(filter, &currInputs, &openLinks, log_ctx) < 0)
+ if(link_filter_inouts(filter, &currInputs, &openInputs, log_ctx) < 0)
goto fail;
- if(parse_outputs(&filters, &currInputs, &openLinks, log_ctx))
+ if(parse_outputs(&filters, &currInputs, &openInputs, &openOutputs,
+ log_ctx) < 0)
goto fail;
filters += consume_whitespace(filters);
@@ -391,10 +376,11 @@ int avfilter_parse_graph(AVFilterGraph *
index++;
} while(chr == ',' || chr == ';');
- if(openLinks && !strcmp(openLinks->name, "out") && currInputs) {
+ if(openInputs && !strcmp(openInputs->name, "out") && currInputs) {
/* Last output can be ommitted if it is "[out]" */
const char *tmp = "[out]";
- if(parse_outputs(&tmp, &currInputs, &openLinks, log_ctx) < 0)
+ if(parse_outputs(&tmp, &currInputs, &openInputs,
+ &openOutputs, log_ctx) < 0)
goto fail;
}
@@ -402,7 +388,8 @@ int avfilter_parse_graph(AVFilterGraph *
fail:
avfilter_destroy_graph(graph);
- free_inout(openLinks);
+ free_inout(openInputs);
+ free_inout(openOutputs);
free_inout(currInputs);
return -1;
}
Modified: libavfilter/graphparser.h
==============================================================================
--- libavfilter/graphparser.h (original)
+++ libavfilter/graphparser.h Sat May 24 19:20:09 2008
@@ -25,16 +25,10 @@
#include "avfilter.h"
#include "avfiltergraph.h"
-enum LinkType {
- LinkTypeIn,
- LinkTypeOut,
-};
-
/**
* A linked-list of the inputs/outputs of the filter chain.
*/
typedef struct AVFilterInOut {
- enum LinkType type;
const char *name;
AVFilterContext *filter;
int pad_idx;
@@ -51,6 +45,7 @@ typedef struct AVFilterInOut {
* @return zero on success, -1 on error
*/
int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
- AVFilterInOut *inouts, AVClass *log_ctx);
+ AVFilterInOut *inputs, AVFilterInOut *outputs,
+ AVClass *log_ctx);
#endif /* FFMPEG_GRAPHPARSER_H */
More information about the FFmpeg-soc
mailing list