From a977d91e28cfe907fe55b9e48cc97d837946f174 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 26 May 2012 11:18:21 +0200 Subject: [PATCH 1/5] avconv: split configuring input filters out of configure_complex_filter --- avconv.c | 98 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 37 deletions(-) diff --git a/avconv.c b/avconv.c index 5861f1bbf2..7463749b1b 100644 --- a/avconv.c +++ b/avconv.c @@ -1119,6 +1119,65 @@ static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFil } } +static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, + AVFilterInOut *in) +{ + AVFilter *filter = avfilter_get_by_name("buffer"); + InputStream *ist = ifilter->ist; + AVRational sar; + char args[255]; + int ret; + + sar = ist->st->sample_aspect_ratio.num ? + ist->st->sample_aspect_ratio : + ist->st->codec->sample_aspect_ratio; + snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, + ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE, + sar.num, sar.den); + + if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, in->name, + args, NULL, fg->graph)) < 0) + return ret; + if ((ret = avfilter_link(ifilter->filter, 0, in->filter_ctx, in->pad_idx)) < 0) + return ret; + return 0; +} + +static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, + AVFilterInOut *in) +{ + AVFilter *filter = avfilter_get_by_name("abuffer"); + InputStream *ist = ifilter->ist; + char args[255]; + int ret; + + snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s" + ":channel_layout=0x%"PRIx64, + ist->st->time_base.num, ist->st->time_base.den, + ist->st->codec->sample_rate, + av_get_sample_fmt_name(ist->st->codec->sample_fmt), + ist->st->codec->channel_layout); + + if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, + in->name, args, NULL, + fg->graph)) < 0) + return ret; + if ((ret = avfilter_link(ifilter->filter, 0, in->filter_ctx, in->pad_idx)) < 0) + return ret; + + return 0; +} + +static int configure_input_filter(FilterGraph *fg, InputFilter *ifilter, + AVFilterInOut *in) +{ + switch (in->filter_ctx->input_pads[in->pad_idx].type) { + case AVMEDIA_TYPE_VIDEO: return configure_input_video_filter(fg, ifilter, in); + case AVMEDIA_TYPE_AUDIO: return configure_input_audio_filter(fg, ifilter, in); + default: av_assert0(0); + } +} + static int configure_complex_filter(FilterGraph *fg) { AVFilterInOut *inputs, *outputs, *cur; @@ -1134,44 +1193,9 @@ static int configure_complex_filter(FilterGraph *fg) for (cur = inputs; init && cur; cur = cur->next) init_input_filter(fg, cur); - for (cur = inputs, i = 0; cur; cur = cur->next, i++) { - InputFilter *ifilter = fg->inputs[i]; - InputStream *ist = ifilter->ist; - AVRational sar; - AVFilter *filter; - char args[255]; - - switch (cur->filter_ctx->input_pads[cur->pad_idx].type) { - case AVMEDIA_TYPE_VIDEO: - sar = ist->st->sample_aspect_ratio.num ? - ist->st->sample_aspect_ratio : - ist->st->codec->sample_aspect_ratio; - snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, - ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE, - sar.num, sar.den); - filter = avfilter_get_by_name("buffer"); - break; - case AVMEDIA_TYPE_AUDIO: - snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:" - "sample_fmt=%s:channel_layout=0x%"PRIx64, - ist->st->time_base.num, ist->st->time_base.den, - ist->st->codec->sample_rate, - av_get_sample_fmt_name(ist->st->codec->sample_fmt), - ist->st->codec->channel_layout); - filter = avfilter_get_by_name("abuffer"); - break; - default: - av_assert0(0); - } - - if ((ret = avfilter_graph_create_filter(&ifilter->filter, - filter, cur->name, - args, NULL, fg->graph)) < 0) + for (cur = inputs, i = 0; cur; cur = cur->next, i++) + if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0) return ret; - if ((ret = avfilter_link(ifilter->filter, 0, - cur->filter_ctx, cur->pad_idx)) < 0) - return ret; - } avfilter_inout_free(&inputs); if (!init) { From 8daf21d5675cd039af4617a89f98c926d3bb486b Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 26 May 2012 12:47:47 +0200 Subject: [PATCH 2/5] avconv: merge configuration code for complex and simple filters Some tests change because -s now inserts the scaler to the end instead of beginning of the filtergraph. --- avconv.c | 343 ++++++++---------------------- tests/lavf-regression.sh | 2 +- tests/ref/fate/idroq-video-encode | 2 +- 3 files changed, 87 insertions(+), 260 deletions(-) diff --git a/avconv.c b/avconv.c index 7463749b1b..2baa063fc3 100644 --- a/avconv.c +++ b/avconv.c @@ -630,240 +630,6 @@ DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, GET_CH_LAYOUT_NAME, ",") -static int configure_audio_filters(FilterGraph *fg, AVFilterContext **in_filter, - AVFilterContext **out_filter) -{ - InputStream *ist = fg->inputs[0]->ist; - OutputStream *ost = fg->outputs[0]->ost; - AVCodecContext *codec = ost->st->codec; - AVCodecContext *icodec = ist->st->codec; - char *sample_fmts, *sample_rates, *channel_layouts; - char args[256]; - int ret; - - avfilter_graph_free(&fg->graph); - if (!(fg->graph = avfilter_graph_alloc())) - return AVERROR(ENOMEM); - - snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:" - "channel_layout=0x%"PRIx64, ist->st->time_base.num, - ist->st->time_base.den, icodec->sample_rate, - av_get_sample_fmt_name(icodec->sample_fmt), icodec->channel_layout); - ret = avfilter_graph_create_filter(&fg->inputs[0]->filter, - avfilter_get_by_name("abuffer"), - "src", args, NULL, fg->graph); - if (ret < 0) - return ret; - - ret = avfilter_graph_create_filter(&fg->outputs[0]->filter, - avfilter_get_by_name("abuffersink"), - "out", NULL, NULL, fg->graph); - if (ret < 0) - return ret; - - *in_filter = fg->inputs[0]->filter; - *out_filter = fg->outputs[0]->filter; - - if (codec->channels && !codec->channel_layout) - codec->channel_layout = av_get_default_channel_layout(codec->channels); - - sample_fmts = choose_sample_fmts(ost); - sample_rates = choose_sample_rates(ost); - channel_layouts = choose_channel_layouts(ost); - if (sample_fmts || sample_rates || channel_layouts) { - AVFilterContext *format; - char args[256]; - int len = 0; - - if (sample_fmts) - len += snprintf(args + len, sizeof(args) - len, "sample_fmts=%s:", - sample_fmts); - if (sample_rates) - len += snprintf(args + len, sizeof(args) - len, "sample_rates=%s:", - sample_rates); - if (channel_layouts) - len += snprintf(args + len, sizeof(args) - len, "channel_layouts=%s:", - channel_layouts); - args[len - 1] = 0; - - av_freep(&sample_fmts); - av_freep(&sample_rates); - av_freep(&channel_layouts); - - ret = avfilter_graph_create_filter(&format, - avfilter_get_by_name("aformat"), - "aformat", args, NULL, fg->graph); - if (ret < 0) - return ret; - - ret = avfilter_link(format, 0, fg->outputs[0]->filter, 0); - if (ret < 0) - return ret; - - *out_filter = format; - } - - if (audio_sync_method > 0) { - AVFilterContext *async; - char args[256]; - int len = 0; - - av_log(NULL, AV_LOG_WARNING, "-async has been deprecated. Used the " - "asyncts audio filter instead.\n"); - - if (audio_sync_method > 1) - len += snprintf(args + len, sizeof(args) - len, "compensate=1:" - "max_comp=%d:", audio_sync_method); - snprintf(args + len, sizeof(args) - len, "min_delta=%f", - audio_drift_threshold); - - ret = avfilter_graph_create_filter(&async, - avfilter_get_by_name("asyncts"), - "async", args, NULL, fg->graph); - if (ret < 0) - return ret; - - ret = avfilter_link(*in_filter, 0, async, 0); - if (ret < 0) - return ret; - - *in_filter = async; - } - - return 0; -} - -static int configure_video_filters(FilterGraph *fg, AVFilterContext **in_filter, - AVFilterContext **out_filter) -{ - InputStream *ist = fg->inputs[0]->ist; - OutputStream *ost = fg->outputs[0]->ost; - AVFilterContext *filter; - AVCodecContext *codec = ost->st->codec; - char *pix_fmts; - AVRational sample_aspect_ratio; - char args[255]; - int ret; - - if (ist->st->sample_aspect_ratio.num) { - sample_aspect_ratio = ist->st->sample_aspect_ratio; - } else - sample_aspect_ratio = ist->st->codec->sample_aspect_ratio; - - snprintf(args, 255, "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, - ist->st->codec->height, ist->st->codec->pix_fmt, - ist->st->time_base.num, ist->st->time_base.den, - sample_aspect_ratio.num, sample_aspect_ratio.den); - - ret = avfilter_graph_create_filter(&fg->inputs[0]->filter, - avfilter_get_by_name("buffer"), - "src", args, NULL, fg->graph); - if (ret < 0) - return ret; - ret = avfilter_graph_create_filter(&fg->outputs[0]->filter, - avfilter_get_by_name("buffersink"), - "out", NULL, NULL, fg->graph); - if (ret < 0) - return ret; - *in_filter = fg->inputs[0]->filter; - *out_filter = fg->outputs[0]->filter; - - if (codec->width || codec->height) { - snprintf(args, 255, "%d:%d:flags=0x%X", - codec->width, - codec->height, - (unsigned)ost->sws_flags); - if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"), - NULL, args, NULL, fg->graph)) < 0) - return ret; - if ((ret = avfilter_link(*in_filter, 0, filter, 0)) < 0) - return ret; - *in_filter = filter; - } - - if (ost->frame_rate.num) { - snprintf(args, sizeof(args), "fps=%d/%d", ost->frame_rate.num, - ost->frame_rate.den); - ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("fps"), - "fps", args, NULL, fg->graph); - if (ret < 0) - return ret; - - ret = avfilter_link(filter, 0, *out_filter, 0); - if (ret < 0) - return ret; - *out_filter = filter; - } - - if ((pix_fmts = choose_pix_fmts(ost))) { - if ((ret = avfilter_graph_create_filter(&filter, - avfilter_get_by_name("format"), - "format", pix_fmts, NULL, - fg->graph)) < 0) - return ret; - if ((ret = avfilter_link(filter, 0, *out_filter, 0)) < 0) - return ret; - - *out_filter = filter; - av_freep(&pix_fmts); - } - - snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags); - fg->graph->scale_sws_opts = av_strdup(args); - - return 0; -} - -static int configure_simple_filtergraph(FilterGraph *fg) -{ - OutputStream *ost = fg->outputs[0]->ost; - AVFilterContext *in_filter, *out_filter; - int ret; - - avfilter_graph_free(&fg->graph); - fg->graph = avfilter_graph_alloc(); - - switch (ost->st->codec->codec_type) { - case AVMEDIA_TYPE_VIDEO: - ret = configure_video_filters(fg, &in_filter, &out_filter); - break; - case AVMEDIA_TYPE_AUDIO: - ret = configure_audio_filters(fg, &in_filter, &out_filter); - break; - default: av_assert0(0); - } - if (ret < 0) - return ret; - - if (ost->avfilter) { - AVFilterInOut *outputs = avfilter_inout_alloc(); - AVFilterInOut *inputs = avfilter_inout_alloc(); - - outputs->name = av_strdup("in"); - outputs->filter_ctx = in_filter; - outputs->pad_idx = 0; - outputs->next = NULL; - - inputs->name = av_strdup("out"); - inputs->filter_ctx = out_filter; - inputs->pad_idx = 0; - inputs->next = NULL; - - if ((ret = avfilter_graph_parse(fg->graph, ost->avfilter, inputs, outputs, NULL)) < 0) - return ret; - } else { - if ((ret = avfilter_link(in_filter, 0, out_filter, 0)) < 0) - return ret; - } - - if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0) - return ret; - - ost->filter = fg->outputs[0]; - - return 0; -} - static FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) { FilterGraph *fg = av_mallocz(sizeof(*fg)); @@ -879,6 +645,8 @@ static FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) fg->outputs[0]->ost = ost; fg->outputs[0]->graph = fg; + ost->filter = fg->outputs[0]; + fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs), &fg->nb_inputs, fg->nb_inputs + 1); if (!(fg->inputs[0] = av_mallocz(sizeof(*fg->inputs[0])))) @@ -970,7 +738,8 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) { char *pix_fmts; - AVCodecContext *codec = ofilter->ost->st->codec; + OutputStream *ost = ofilter->ost; + AVCodecContext *codec = ost->st->codec; AVFilterContext *last_filter = out->filter_ctx; int pad_idx = out->pad_idx; int ret; @@ -989,7 +758,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, snprintf(args, sizeof(args), "%d:%d:flags=0x%X", codec->width, codec->height, - (unsigned)ofilter->ost->sws_flags); + (unsigned)ost->sws_flags); if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"), NULL, args, NULL, fg->graph)) < 0) return ret; @@ -1000,7 +769,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, pad_idx = 0; } - if ((pix_fmts = choose_pix_fmts(ofilter->ost))) { + if ((pix_fmts = choose_pix_fmts(ost))) { AVFilterContext *filter; if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("format"), @@ -1015,6 +784,24 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, av_freep(&pix_fmts); } + if (ost->frame_rate.num) { + AVFilterContext *fps; + char args[255]; + + snprintf(args, sizeof(args), "fps=%d/%d", ost->frame_rate.num, + ost->frame_rate.den); + ret = avfilter_graph_create_filter(&fps, avfilter_get_by_name("fps"), + "fps", args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(last_filter, pad_idx, fps, 0); + if (ret < 0) + return ret; + last_filter = fps; + pad_idx = 0; + } + if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0) return ret; @@ -1132,7 +919,8 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, ist->st->sample_aspect_ratio : ist->st->codec->sample_aspect_ratio; snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, - ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE, + ist->st->codec->height, ist->st->codec->pix_fmt, + ist->st->time_base.num, ist->st->time_base.den, sar.num, sar.den); if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, in->name, @@ -1146,8 +934,10 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { + AVFilterContext *first_filter = in->filter_ctx; AVFilter *filter = avfilter_get_by_name("abuffer"); InputStream *ist = ifilter->ist; + int pad_idx = in->pad_idx; char args[255]; int ret; @@ -1162,7 +952,35 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, in->name, args, NULL, fg->graph)) < 0) return ret; - if ((ret = avfilter_link(ifilter->filter, 0, in->filter_ctx, in->pad_idx)) < 0) + + if (audio_sync_method > 0) { + AVFilterContext *async; + char args[256]; + int len = 0; + + av_log(NULL, AV_LOG_WARNING, "-async has been deprecated. Used the " + "asyncts audio filter instead.\n"); + + if (audio_sync_method > 1) + len += snprintf(args + len, sizeof(args) - len, "compensate=1:" + "max_comp=%d:", audio_sync_method); + snprintf(args + len, sizeof(args) - len, "min_delta=%f", + audio_drift_threshold); + + ret = avfilter_graph_create_filter(&async, + avfilter_get_by_name("asyncts"), + "async", args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(async, 0, first_filter, pad_idx); + if (ret < 0) + return ret; + + first_filter = async; + pad_idx = 0; + } + if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) return ret; return 0; @@ -1178,19 +996,34 @@ static int configure_input_filter(FilterGraph *fg, InputFilter *ifilter, } } -static int configure_complex_filter(FilterGraph *fg) +static int configure_filtergraph(FilterGraph *fg) { AVFilterInOut *inputs, *outputs, *cur; - int ret, i, init = !fg->graph; + int ret, i, init = !fg->graph, simple = !fg->graph_desc; + const char *graph_desc = simple ? fg->outputs[0]->ost->avfilter : + fg->graph_desc; avfilter_graph_free(&fg->graph); if (!(fg->graph = avfilter_graph_alloc())) return AVERROR(ENOMEM); - if ((ret = avfilter_graph_parse2(fg->graph, fg->graph_desc, &inputs, &outputs)) < 0) + if (simple) { + OutputStream *ost = fg->outputs[0]->ost; + char args[255]; + snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags); + fg->graph->scale_sws_opts = av_strdup(args); + } + + if ((ret = avfilter_graph_parse2(fg->graph, graph_desc, &inputs, &outputs)) < 0) return ret; - for (cur = inputs; init && cur; cur = cur->next) + if (simple && (!inputs || inputs->next || !outputs || outputs->next)) { + av_log(NULL, AV_LOG_ERROR, "Simple filtergraph '%s' does not have " + "exactly one input and output.\n", graph_desc); + return AVERROR(EINVAL); + } + + for (cur = inputs; !simple && init && cur; cur = cur->next) init_input_filter(fg, cur); for (cur = inputs, i = 0; cur; cur = cur->next, i++) @@ -1198,7 +1031,7 @@ static int configure_complex_filter(FilterGraph *fg) return ret; avfilter_inout_free(&inputs); - if (!init) { + if (!init || simple) { /* we already know the mappings between lavfi outputs and output streams, * so we can finish the setup */ for (cur = outputs, i = 0; cur; cur = cur->next, i++) @@ -1230,17 +1063,11 @@ static int configure_complex_filters(void) for (i = 0; i < nb_filtergraphs; i++) if (!filtergraphs[i]->graph && - (ret = configure_complex_filter(filtergraphs[i])) < 0) + (ret = configure_filtergraph(filtergraphs[i])) < 0) return ret; return 0; } -static int configure_filtergraph(FilterGraph *fg) -{ - return fg->graph_desc ? configure_complex_filter(fg) : - configure_simple_filtergraph(fg); -} - static int ist_in_filtergraph(FilterGraph *fg, InputStream *ist) { int i; @@ -2751,7 +2578,7 @@ static int transcode_init(void) codec->codec_type == AVMEDIA_TYPE_AUDIO)) { FilterGraph *fg; fg = init_simple_filtergraph(ist, ost); - if (configure_simple_filtergraph(fg)) { + if (configure_filtergraph(fg)) { av_log(NULL, AV_LOG_FATAL, "Error opening filters!\n"); exit(1); } @@ -3960,7 +3787,8 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) const char *p = NULL; char *forced_key_frames = NULL, *frame_rate = NULL, *frame_size = NULL; char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL; - char *intra_matrix = NULL, *inter_matrix = NULL, *filters = NULL; + char *intra_matrix = NULL, *inter_matrix = NULL; + const char *filters = "null"; int i; MATCH_PER_STREAM_OPT(frame_rates, str, frame_rate, oc, st); @@ -4051,8 +3879,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st); MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); - if (filters) - ost->avfilter = av_strdup(filters); + ost->avfilter = av_strdup(filters); } else { MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st); } @@ -4073,7 +3900,8 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc) audio_enc->codec_type = AVMEDIA_TYPE_AUDIO; if (!ost->stream_copy) { - char *sample_fmt = NULL, *filters = NULL;; + char *sample_fmt = NULL; + const char *filters = "anull"; MATCH_PER_STREAM_OPT(audio_channels, i, audio_enc->channels, oc, st); @@ -4087,8 +3915,7 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc) MATCH_PER_STREAM_OPT(audio_sample_rate, i, audio_enc->sample_rate, oc, st); MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); - if (filters) - ost->avfilter = av_strdup(filters); + ost->avfilter = av_strdup(filters); } return ost; diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 1d4e26252c..a1983063d3 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -67,7 +67,7 @@ do_lavf mxf "-ar 48000" "-bf 2 -timecode_frame_start 264363" fi if [ -n "$do_mxf_d10" ]; then -do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -s 720x576 -vf pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10" +do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10" fi if [ -n "$do_ts" ] ; then diff --git a/tests/ref/fate/idroq-video-encode b/tests/ref/fate/idroq-video-encode index 859d3b8118..badb06d11d 100644 --- a/tests/ref/fate/idroq-video-encode +++ b/tests/ref/fate/idroq-video-encode @@ -1 +1 @@ -5090bb74bad2ea17093c32682b608dc4 +2ac89fa0e5600152667bcbc661f06cfe From cf6c38c62bfd81022af6ff2f4d1227634025f6a0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 26 May 2012 13:31:54 +0200 Subject: [PATCH 3/5] avconv: don't print filters inserted by avconv in stream mappings. --- avconv.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/avconv.c b/avconv.c index 2baa063fc3..e13b2aa5ae 100644 --- a/avconv.c +++ b/avconv.c @@ -146,12 +146,14 @@ typedef struct InputFilter { AVFilterContext *filter; struct InputStream *ist; struct FilterGraph *graph; + uint8_t *name; } InputFilter; typedef struct OutputFilter { AVFilterContext *filter; struct OutputStream *ost; struct FilterGraph *graph; + uint8_t *name; /* temporary storage until stream maps are processed */ AVFilterInOut *out_tmp; @@ -897,8 +899,28 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, return 0; } +#define DESCRIBE_FILTER_LINK(f, inout, in) \ +{ \ + AVFilterContext *ctx = inout->filter_ctx; \ + AVFilterPad *pads = in ? ctx->input_pads : ctx->output_pads; \ + int nb_pads = in ? ctx->input_count : ctx->output_count; \ + AVIOContext *pb; \ + \ + if (avio_open_dyn_buf(&pb) < 0) \ + exit_program(1); \ + \ + avio_printf(pb, "%s", ctx->filter->name); \ + if (nb_pads > 1) \ + avio_printf(pb, ":%s", pads[inout->pad_idx].name); \ + avio_w8(pb, 0); \ + avio_close_dyn_buf(pb, &f->name); \ +} + static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) { + av_freep(&ofilter->name); + DESCRIBE_FILTER_LINK(ofilter, out, 0); + switch (out->filter_ctx->output_pads[out->pad_idx].type) { case AVMEDIA_TYPE_VIDEO: return configure_output_video_filter(fg, ofilter, out); case AVMEDIA_TYPE_AUDIO: return configure_output_audio_filter(fg, ofilter, out); @@ -989,6 +1011,9 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, static int configure_input_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { + av_freep(&ifilter->name); + DESCRIBE_FILTER_LINK(ifilter, in, 1); + switch (in->filter_ctx->input_pads[in->pad_idx].type) { case AVMEDIA_TYPE_VIDEO: return configure_input_video_filter(fg, ifilter, in); case AVMEDIA_TYPE_AUDIO: return configure_input_audio_filter(fg, ifilter, in); @@ -1115,11 +1140,15 @@ void exit_program(int ret) for (i = 0; i < nb_filtergraphs; i++) { avfilter_graph_free(&filtergraphs[i]->graph); - for (j = 0; j < filtergraphs[i]->nb_inputs; j++) + for (j = 0; j < filtergraphs[i]->nb_inputs; j++) { + av_freep(&filtergraphs[i]->inputs[j]->name); av_freep(&filtergraphs[i]->inputs[j]); + } av_freep(&filtergraphs[i]->inputs); - for (j = 0; j < filtergraphs[i]->nb_outputs; j++) + for (j = 0; j < filtergraphs[i]->nb_outputs; j++) { + av_freep(&filtergraphs[i]->outputs[j]->name); av_freep(&filtergraphs[i]->outputs[j]); + } av_freep(&filtergraphs[i]->outputs); av_freep(&filtergraphs[i]); } @@ -2742,13 +2771,10 @@ static int transcode_init(void) ist = input_streams[i]; for (j = 0; j < ist->nb_filters; j++) { - AVFilterLink *link = ist->filters[j]->filter->outputs[0]; if (ist->filters[j]->graph->graph_desc) { av_log(NULL, AV_LOG_INFO, " Stream #%d:%d (%s) -> %s", ist->file_index, ist->st->index, ist->dec ? ist->dec->name : "?", - link->dst->filter->name); - if (link->dst->input_count > 1) - av_log(NULL, AV_LOG_INFO, ":%s", link->dstpad->name); + ist->filters[j]->name); if (nb_filtergraphs > 1) av_log(NULL, AV_LOG_INFO, " (graph %d)", ist->filters[j]->graph->index); av_log(NULL, AV_LOG_INFO, "\n"); @@ -2768,10 +2794,7 @@ static int transcode_init(void) if (ost->filter && ost->filter->graph->graph_desc) { /* output from a complex graph */ - AVFilterLink *link = ost->filter->filter->inputs[0]; - av_log(NULL, AV_LOG_INFO, " %s", link->src->filter->name); - if (link->src->output_count > 1) - av_log(NULL, AV_LOG_INFO, ":%s", link->srcpad->name); + av_log(NULL, AV_LOG_INFO, " %s", ost->filter->name); if (nb_filtergraphs > 1) av_log(NULL, AV_LOG_INFO, " (graph %d)", ost->filter->graph->index); From 4f81a5072a59798e22ffacb091b4dd6b865b9a80 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 26 May 2012 13:52:44 +0200 Subject: [PATCH 4/5] doc/avconv: expand documentation for the -s option. --- doc/avconv.texi | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/avconv.texi b/doc/avconv.texi index d6e409612e..693c45e429 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -260,8 +260,18 @@ Set the number of video frames to record. This is an alias for @code{-frames:v}. Set frame rate (Hz value, fraction or abbreviation), (default = 25). For output streams implies @code{-vsync cfr}. @item -s[:@var{stream_specifier}] @var{size} (@emph{input/output,per-stream}) -Set frame size. The format is @samp{wxh} (default - same as source). -The following abbreviations are recognized: +Set frame size. + +As an input option, this is a shortcut for the @option{video_size} private +option, recognized by some demuxers for which the frame size is either not +stored in the file or is configurable -- e.g. raw video or video grabbers. + +As an output option, this inserts the @code{scale} video filter to the +@emph{end} of the corresponding filtergraph. Please use the @code{scale} filter +directly to insert it at the beginning or some other place. + +The format is @samp{wxh} (default - same as source). The following +abbreviations are recognized: @table @samp @item sqcif 128x96 From c9cc76290f8139a012a12efe7e581276b8bd8dff Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 26 May 2012 16:52:58 +0200 Subject: [PATCH 5/5] avconv: extend -r to work on any input stream. This is done by automatically inserting a setpts filter. --- avconv.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- configure | 3 ++- doc/avconv.texi | 11 +++++++++-- 3 files changed, 53 insertions(+), 7 deletions(-) diff --git a/avconv.c b/avconv.c index e13b2aa5ae..cbf66c44eb 100644 --- a/avconv.c +++ b/avconv.c @@ -203,6 +203,7 @@ typedef struct InputStream { int is_start; /* is 1 at the start and after a discontinuity */ int showed_multi_packet_warning; AVDictionary *opts; + AVRational framerate; /* framerate forced with -r */ int resample_height; int resample_width; @@ -931,10 +932,15 @@ static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFil static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, AVFilterInOut *in) { + AVFilterContext *first_filter = in->filter_ctx; AVFilter *filter = avfilter_get_by_name("buffer"); InputStream *ist = ifilter->ist; + AVRational tb = ist->framerate.num ? (AVRational){ist->framerate.den, + ist->framerate.num} : + ist->st->time_base; AVRational sar; char args[255]; + int pad_idx = in->pad_idx; int ret; sar = ist->st->sample_aspect_ratio.num ? @@ -942,13 +948,29 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, ist->st->codec->sample_aspect_ratio; snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, ist->st->codec->height, ist->st->codec->pix_fmt, - ist->st->time_base.num, ist->st->time_base.den, - sar.num, sar.den); + tb.num, tb.den, sar.num, sar.den); if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, in->name, args, NULL, fg->graph)) < 0) return ret; - if ((ret = avfilter_link(ifilter->filter, 0, in->filter_ctx, in->pad_idx)) < 0) + + if (ist->framerate.num) { + AVFilterContext *setpts; + + if ((ret = avfilter_graph_create_filter(&setpts, + avfilter_get_by_name("setpts"), + "setpts", "N", NULL, + fg->graph)) < 0) + return ret; + + if ((ret = avfilter_link(setpts, 0, first_filter, pad_idx)) < 0) + return ret; + + first_filter = setpts; + pad_idx = 0; + } + + if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) return ret; return 0; } @@ -3358,6 +3380,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) AVStream *st = ic->streams[i]; AVCodecContext *dec = st->codec; InputStream *ist = av_mallocz(sizeof(*ist)); + char *framerate = NULL; if (!ist) exit_program(1); @@ -3382,6 +3405,14 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->resample_width = dec->width; ist->resample_pix_fmt = dec->pix_fmt; + MATCH_PER_STREAM_OPT(frame_rates, str, framerate, ic, st); + if (framerate && av_parse_video_rate(&ist->framerate, + framerate) < 0) { + av_log(NULL, AV_LOG_ERROR, "Error parsing framerate %s.\n", + framerate); + exit_program(1); + } + break; case AVMEDIA_TYPE_AUDIO: guess_input_channel_layout(ist); @@ -3503,7 +3534,14 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena } } if (o->nb_frame_rates) { - av_dict_set(&format_opts, "framerate", o->frame_rates[o->nb_frame_rates - 1].u.str, 0); + /* set the format-level framerate option; + * this is important for video grabbers, e.g. x11 */ + if (file_iformat && file_iformat->priv_class && + av_opt_find(&file_iformat->priv_class, "framerate", NULL, 0, + AV_OPT_SEARCH_FAKE_OBJ)) { + av_dict_set(&format_opts, "framerate", + o->frame_rates[o->nb_frame_rates - 1].u.str, 0); + } } if (o->nb_frame_sizes) { av_dict_set(&format_opts, "video_size", o->frame_sizes[o->nb_frame_sizes - 1].u.str, 0); diff --git a/configure b/configure index c3edc9375c..67371c8102 100755 --- a/configure +++ b/configure @@ -1536,7 +1536,8 @@ avfilter_deps="swscale" avformat_deps="avcodec" # programs -avconv_deps="avcodec avfilter avformat avresample swscale format_filter" +avconv_deps="avcodec avfilter avformat avresample swscale format_filter + setpts_filter" avplay_deps="avcodec avformat swscale sdl" avplay_select="rdft" avprobe_deps="avcodec avformat" diff --git a/doc/avconv.texi b/doc/avconv.texi index 693c45e429..2ebfe9fe44 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -257,8 +257,15 @@ attachments. @item -vframes @var{number} (@emph{output}) Set the number of video frames to record. This is an alias for @code{-frames:v}. @item -r[:@var{stream_specifier}] @var{fps} (@emph{input/output,per-stream}) -Set frame rate (Hz value, fraction or abbreviation), (default = 25). For output -streams implies @code{-vsync cfr}. +Set frame rate (Hz value, fraction or abbreviation). + +As an input option, ignore any timestamps stored in the file and instead +generate timestamps assuming constant frame rate @var{fps}. + +As an output option, duplicate or drop input frames to achieve constant output +frame rate @var{fps} (note that this actually causes the @code{fps} filter to be +inserted to the end of the corresponding filtergraph). + @item -s[:@var{stream_specifier}] @var{size} (@emph{input/output,per-stream}) Set frame size.