X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=avconv_filter.c;h=e54da56c7a0fdc8b7984fd3e3553264d5652e791;hb=1bd0bdcdc236099d5c0d179696951f35f5310fa5;hp=ec38957cc1ea8a56f6a152c59cdf81efd98cbe4e;hpb=58dee6e62d593747b5dbe8ce6c2ff1833151b9b0;p=ffmpeg diff --git a/avconv_filter.c b/avconv_filter.c index ec38957cc1e..e54da56c7a0 100644 --- a/avconv_filter.c +++ b/avconv_filter.c @@ -18,39 +18,42 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "avconv.h" #include "libavfilter/avfilter.h" -#include "libavfilter/avfiltergraph.h" -#include "libavutil/audioconvert.h" +#include "libavresample/avresample.h" + #include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" +#include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/pixfmt.h" #include "libavutil/samplefmt.h" -/** - * Define a function for building a string containing a list of - * allowed formats, - */ -#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name, separator)\ +/* Define a function for building a string containing a list of + * allowed formats. */ +#define DEF_CHOOSE_FORMAT(type, var, supported_list, none, get_name) \ static char *choose_ ## var ## s(OutputStream *ost) \ { \ - if (ost->st->codec->var != none) { \ - get_name(ost->st->codec->var); \ + if (ost->enc_ctx->var != none) { \ + get_name(ost->enc_ctx->var); \ return av_strdup(name); \ - } else if (ost->enc->supported_list) { \ + } else if (ost->enc && ost->enc->supported_list) { \ const type *p; \ AVIOContext *s = NULL; \ uint8_t *ret; \ int len; \ \ if (avio_open_dyn_buf(&s) < 0) \ - exit_program(1); \ + exit(1); \ \ for (p = ost->enc->supported_list; *p != none; p++) { \ get_name(*p); \ - avio_printf(s, "%s" separator, name); \ + avio_printf(s, "%s|", name); \ } \ len = avio_close_dyn_buf(s, &ret); \ ret[len - 1] = 0; \ @@ -59,48 +62,44 @@ static char *choose_ ## var ## s(OutputStream *ost) \ return NULL; \ } -DEF_CHOOSE_FORMAT(enum PixelFormat, pix_fmt, pix_fmts, PIX_FMT_NONE, - GET_PIX_FMT_NAME, ":") +DEF_CHOOSE_FORMAT(enum AVPixelFormat, pix_fmt, pix_fmts, AV_PIX_FMT_NONE, + GET_PIX_FMT_NAME) DEF_CHOOSE_FORMAT(enum AVSampleFormat, sample_fmt, sample_fmts, - AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME, ",") + AV_SAMPLE_FMT_NONE, GET_SAMPLE_FMT_NAME) DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, - GET_SAMPLE_RATE_NAME, ",") + GET_SAMPLE_RATE_NAME) DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, - GET_CH_LAYOUT_NAME, ",") + GET_CH_LAYOUT_NAME) FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) { FilterGraph *fg = av_mallocz(sizeof(*fg)); if (!fg) - exit_program(1); + exit(1); fg->index = nb_filtergraphs; - fg->outputs = grow_array(fg->outputs, sizeof(*fg->outputs), &fg->nb_outputs, - fg->nb_outputs + 1); + GROW_ARRAY(fg->outputs, fg->nb_outputs); if (!(fg->outputs[0] = av_mallocz(sizeof(*fg->outputs[0])))) - exit_program(1); + exit(1); 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); + GROW_ARRAY(fg->inputs, fg->nb_inputs); if (!(fg->inputs[0] = av_mallocz(sizeof(*fg->inputs[0])))) - exit_program(1); + exit(1); fg->inputs[0]->ist = ist; fg->inputs[0]->graph = fg; - ist->filters = grow_array(ist->filters, sizeof(*ist->filters), - &ist->nb_filters, ist->nb_filters + 1); + GROW_ARRAY(ist->filters, ist->nb_filters); ist->filters[ist->nb_filters - 1] = fg->inputs[0]; - filtergraphs = grow_array(filtergraphs, sizeof(*filtergraphs), - &nb_filtergraphs, nb_filtergraphs + 1); + GROW_ARRAY(filtergraphs, nb_filtergraphs); filtergraphs[nb_filtergraphs - 1] = fg; return fg; @@ -116,7 +115,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) if (type != AVMEDIA_TYPE_VIDEO && type != AVMEDIA_TYPE_AUDIO) { av_log(NULL, AV_LOG_FATAL, "Only video and audio filters supported " "currently.\n"); - exit_program(1); + exit(1); } if (in->name) { @@ -128,7 +127,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) if (file_idx < 0 || file_idx >= nb_input_files) { av_log(NULL, AV_LOG_FATAL, "Invalid file index %d in filtegraph description %s.\n", file_idx, fg->graph_desc); - exit_program(1); + exit(1); } s = input_files[file_idx]->ctx; @@ -143,21 +142,21 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) if (!st) { av_log(NULL, AV_LOG_FATAL, "Stream specifier '%s' in filtergraph description %s " "matches no streams.\n", p, fg->graph_desc); - exit_program(1); + exit(1); } ist = input_streams[input_files[file_idx]->ist_index + st->index]; } else { /* find the first unused stream of corresponding type */ for (i = 0; i < nb_input_streams; i++) { ist = input_streams[i]; - if (ist->st->codec->codec_type == type && ist->discard) + if (ist->dec_ctx->codec_type == type && ist->discard) break; } if (i == nb_input_streams) { av_log(NULL, AV_LOG_FATAL, "Cannot find a matching stream for " - "unlabeled input pad %d on filter %s", in->pad_idx, + "unlabeled input pad %d on filter %s\n", in->pad_idx, in->filter_ctx->name); - exit_program(1); + exit(1); } } av_assert0(ist); @@ -166,23 +165,73 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) ist->decoding_needed = 1; ist->st->discard = AVDISCARD_NONE; - fg->inputs = grow_array(fg->inputs, sizeof(*fg->inputs), - &fg->nb_inputs, fg->nb_inputs + 1); + GROW_ARRAY(fg->inputs, fg->nb_inputs); if (!(fg->inputs[fg->nb_inputs - 1] = av_mallocz(sizeof(*fg->inputs[0])))) - exit_program(1); + exit(1); fg->inputs[fg->nb_inputs - 1]->ist = ist; fg->inputs[fg->nb_inputs - 1]->graph = fg; - ist->filters = grow_array(ist->filters, sizeof(*ist->filters), - &ist->nb_filters, ist->nb_filters + 1); + GROW_ARRAY(ist->filters, ist->nb_filters); ist->filters[ist->nb_filters - 1] = fg->inputs[fg->nb_inputs - 1]; } +static int insert_trim(int64_t start_time, int64_t duration, + AVFilterContext **last_filter, int *pad_idx, + const char *filter_name) +{ + AVFilterGraph *graph = (*last_filter)->graph; + AVFilterContext *ctx; + const AVFilter *trim; + enum AVMediaType type = avfilter_pad_get_type((*last_filter)->output_pads, *pad_idx); + const char *name = (type == AVMEDIA_TYPE_VIDEO) ? "trim" : "atrim"; + int ret = 0; + + if (duration == INT64_MAX && start_time == AV_NOPTS_VALUE) + return 0; + + trim = avfilter_get_by_name(name); + if (!trim) { + av_log(NULL, AV_LOG_ERROR, "%s filter not present, cannot limit " + "recording time.\n", name); + return AVERROR_FILTER_NOT_FOUND; + } + + ctx = avfilter_graph_alloc_filter(graph, trim, filter_name); + if (!ctx) + return AVERROR(ENOMEM); + + if (duration != INT64_MAX) { + ret = av_opt_set_double(ctx, "duration", (double)duration / 1e6, + AV_OPT_SEARCH_CHILDREN); + } + if (ret >= 0 && start_time != AV_NOPTS_VALUE) { + ret = av_opt_set_double(ctx, "start", (double)start_time / 1e6, + AV_OPT_SEARCH_CHILDREN); + } + if (ret < 0) { + av_log(ctx, AV_LOG_ERROR, "Error configuring the %s filter", name); + return ret; + } + + ret = avfilter_init_str(ctx, NULL); + if (ret < 0) + return ret; + + ret = avfilter_link(*last_filter, *pad_idx, ctx, 0); + if (ret < 0) + return ret; + + *last_filter = ctx; + *pad_idx = 0; + return 0; +} + static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) { char *pix_fmts; OutputStream *ost = ofilter->ost; - AVCodecContext *codec = ost->st->codec; + OutputFile *of = output_files[ost->file_index]; + AVCodecContext *codec = ost->enc_ctx; AVFilterContext *last_filter = out->filter_ctx; int pad_idx = out->pad_idx; int ret; @@ -199,7 +248,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, char args[255]; AVFilterContext *filter; - snprintf(args, sizeof(args), "%d:%d:flags=0x%X", + snprintf(args, sizeof(args), "%d:%d:0x%X", codec->width, codec->height, (unsigned)ost->sws_flags); @@ -219,17 +268,17 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterContext *filter; snprintf(name, sizeof(name), "pixel format for output stream %d:%d", ost->file_index, ost->index); - if ((ret = avfilter_graph_create_filter(&filter, - avfilter_get_by_name("format"), - "format", pix_fmts, NULL, - fg->graph)) < 0) + ret = avfilter_graph_create_filter(&filter, + avfilter_get_by_name("format"), + "format", pix_fmts, NULL, fg->graph); + av_freep(&pix_fmts); + if (ret < 0) return ret; if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0) return ret; last_filter = filter; pad_idx = 0; - av_freep(&pix_fmts); } if (ost->frame_rate.num) { @@ -252,6 +301,14 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, pad_idx = 0; } + snprintf(name, sizeof(name), "trim for output stream %d:%d", + ost->file_index, ost->index); + ret = insert_trim(of->start_time, of->recording_time, + &last_filter, &pad_idx, name); + if (ret < 0) + return ret; + + if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0) return ret; @@ -261,7 +318,8 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) { OutputStream *ost = ofilter->ost; - AVCodecContext *codec = ost->st->codec; + OutputFile *of = output_files[ost->file_index]; + AVCodecContext *codec = ost->enc_ctx; AVFilterContext *last_filter = out->filter_ctx; int pad_idx = out->pad_idx; char *sample_fmts, *sample_rates, *channel_layouts; @@ -318,6 +376,13 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, pad_idx = 0; } + snprintf(name, sizeof(name), "trim for output stream %d:%d", + ost->file_index, ost->index); + ret = insert_trim(of->start_time, of->recording_time, + &last_filter, &pad_idx, name); + if (ret < 0) + return ret; + if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0) return ret; @@ -328,11 +393,11 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, { \ AVFilterContext *ctx = inout->filter_ctx; \ AVFilterPad *pads = in ? ctx->input_pads : ctx->output_pads; \ - int nb_pads = in ? ctx->input_count : ctx->output_count; \ + int nb_pads = in ? ctx->nb_inputs : ctx->nb_outputs; \ AVIOContext *pb; \ \ if (avio_open_dyn_buf(&pb) < 0) \ - exit_program(1); \ + exit(1); \ \ avio_printf(pb, "%s", ctx->filter->name); \ if (nb_pads > 1) \ @@ -356,28 +421,30 @@ int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOu 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"); + AVFilterContext *last_filter; + const AVFilter *buffer_filt = avfilter_get_by_name("buffer"); InputStream *ist = ifilter->ist; + InputFile *f = input_files[ist->file_index]; AVRational tb = ist->framerate.num ? av_inv_q(ist->framerate) : ist->st->time_base; AVRational sar; char args[255], name[255]; - int pad_idx = in->pad_idx; - int ret; + int ret, pad_idx = 0; 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, + ist->dec_ctx->sample_aspect_ratio; + snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->dec_ctx->width, + ist->dec_ctx->height, + ist->hwaccel_retrieve_data ? ist->hwaccel_retrieved_pix_fmt : ist->dec_ctx->pix_fmt, tb.num, tb.den, sar.num, sar.den); snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, ist->file_index, ist->st->index); - if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, name, + if ((ret = avfilter_graph_create_filter(&ifilter->filter, buffer_filt, name, args, NULL, fg->graph)) < 0) return ret; + last_filter = ifilter->filter; if (ist->framerate.num) { AVFilterContext *setpts; @@ -390,14 +457,20 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, fg->graph)) < 0) return ret; - if ((ret = avfilter_link(setpts, 0, first_filter, pad_idx)) < 0) + if ((ret = avfilter_link(last_filter, 0, setpts, 0)) < 0) return ret; - first_filter = setpts; - pad_idx = 0; + last_filter = setpts; } - if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) + snprintf(name, sizeof(name), "trim for input stream %d:%d", + ist->file_index, ist->st->index); + ret = insert_trim(((f->start_time == AV_NOPTS_VALUE) || !f->accurate_seek) ? + AV_NOPTS_VALUE : 0, f->recording_time, &last_filter, &pad_idx, name); + if (ret < 0) + return ret; + + if ((ret = avfilter_link(last_filter, 0, in->filter_ctx, in->pad_idx)) < 0) return ret; return 0; } @@ -405,30 +478,30 @@ 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"); + AVFilterContext *last_filter; + const AVFilter *abuffer_filt = avfilter_get_by_name("abuffer"); InputStream *ist = ifilter->ist; - int pad_idx = in->pad_idx; + InputFile *f = input_files[ist->file_index]; char args[255], name[255]; - int ret; + int ret, pad_idx = 0; snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s" ":channel_layout=0x%"PRIx64, - 1, ist->st->codec->sample_rate, - ist->st->codec->sample_rate, - av_get_sample_fmt_name(ist->st->codec->sample_fmt), - ist->st->codec->channel_layout); + 1, ist->dec_ctx->sample_rate, + ist->dec_ctx->sample_rate, + av_get_sample_fmt_name(ist->dec_ctx->sample_fmt), + ist->dec_ctx->channel_layout); snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, ist->file_index, ist->st->index); - if ((ret = avfilter_graph_create_filter(&ifilter->filter, filter, + if ((ret = avfilter_graph_create_filter(&ifilter->filter, abuffer_filt, name, args, NULL, fg->graph)) < 0) return ret; + last_filter = ifilter->filter; 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 " @@ -448,14 +521,43 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, if (ret < 0) return ret; - ret = avfilter_link(async, 0, first_filter, pad_idx); + ret = avfilter_link(last_filter, 0, async, 0); if (ret < 0) return ret; - first_filter = async; - pad_idx = 0; + last_filter = async; } - if ((ret = avfilter_link(ifilter->filter, 0, first_filter, pad_idx)) < 0) + if (audio_volume != 256) { + AVFilterContext *volume; + + av_log(NULL, AV_LOG_WARNING, "-vol has been deprecated. Use the volume " + "audio filter instead.\n"); + + snprintf(args, sizeof(args), "volume=%f", audio_volume / 256.0); + + snprintf(name, sizeof(name), "graph %d volume for input stream %d:%d", + fg->index, ist->file_index, ist->st->index); + ret = avfilter_graph_create_filter(&volume, + avfilter_get_by_name("volume"), + name, args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(last_filter, 0, volume, 0); + if (ret < 0) + return ret; + + last_filter = volume; + } + + snprintf(name, sizeof(name), "trim for input stream %d:%d", + ist->file_index, ist->st->index); + ret = insert_trim(((f->start_time == AV_NOPTS_VALUE) || !f->accurate_seek) ? + AV_NOPTS_VALUE : 0, f->recording_time, &last_filter, &pad_idx, name); + if (ret < 0) + return ret; + + if ((ret = avfilter_link(last_filter, 0, in->filter_ctx, in->pad_idx)) < 0) return ret; return 0; @@ -487,9 +589,20 @@ int configure_filtergraph(FilterGraph *fg) if (simple) { OutputStream *ost = fg->outputs[0]->ost; - char args[255]; + char args[512]; + AVDictionaryEntry *e = NULL; + snprintf(args, sizeof(args), "flags=0x%X", (unsigned)ost->sws_flags); fg->graph->scale_sws_opts = av_strdup(args); + + args[0] = '\0'; + while ((e = av_dict_get(fg->outputs[0]->ost->resample_opts, "", e, + AV_DICT_IGNORE_SUFFIX))) { + av_strlcatf(args, sizeof(args), "%s=%s:", e->key, e->value); + } + if (strlen(args)) + args[strlen(args) - 1] = '\0'; + fg->graph->resample_lavr_opts = av_strdup(args); } if ((ret = avfilter_graph_parse2(fg->graph, graph_desc, &inputs, &outputs)) < 0) @@ -521,10 +634,9 @@ int configure_filtergraph(FilterGraph *fg) } else { /* wait until output mappings are processed */ for (cur = outputs; cur;) { - fg->outputs = grow_array(fg->outputs, sizeof(*fg->outputs), - &fg->nb_outputs, fg->nb_outputs + 1); + GROW_ARRAY(fg->outputs, fg->nb_outputs); if (!(fg->outputs[fg->nb_outputs - 1] = av_mallocz(sizeof(*fg->outputs[0])))) - exit_program(1); + exit(1); fg->outputs[fg->nb_outputs - 1]->graph = fg; fg->outputs[fg->nb_outputs - 1]->out_tmp = cur; cur = cur->next;