X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=avconv_opt.c;h=ae9b72ee9da4778d316d50bc3e36e69c3cdc86a4;hb=0313653928b47c3b0e493c08c66bb1a374695f7c;hp=cd3f7f65b2305862a176b86d0e2c83487a2a5816;hpb=41d2008b15c2e80aeaa53f3db8f9c51da13c788d;p=ffmpeg diff --git a/avconv_opt.c b/avconv_opt.c index cd3f7f65b23..ae9b72ee9da 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -28,7 +28,6 @@ #include "libavcodec/avcodec.h" #include "libavfilter/avfilter.h" -#include "libavfilter/avfiltergraph.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" @@ -62,7 +61,6 @@ float dts_delta_threshold = 10; int audio_volume = 256; int audio_sync_method = 0; int video_sync_method = VSYNC_AUTO; -int do_deinterlace = 0; int do_benchmark = 0; int do_hex_dump = 0; int do_pkt_dump = 0; @@ -119,6 +117,24 @@ static void init_options(OptionsContext *o) o->chapters_input_file = INT_MAX; } +/* return a copy of the input with the stream specifiers removed from the keys */ +static AVDictionary *strip_specifiers(AVDictionary *dict) +{ + AVDictionaryEntry *e = NULL; + AVDictionary *ret = NULL; + + while ((e = av_dict_get(dict, "", e, AV_DICT_IGNORE_SUFFIX))) { + char *p = strchr(e->key, ':'); + + if (p) + *p = 0; + av_dict_set(&ret, e->key, e->value, 0); + if (p) + *p = ':'; + } + return ret; +} + static double parse_frame_aspect_ratio(const char *arg) { int x = 0, y = 0; @@ -553,6 +569,8 @@ static int open_input_file(OptionsContext *o, const char *filename) int64_t timestamp; uint8_t buf[128]; AVDictionary **opts; + AVDictionary *unused_opts = NULL; + AVDictionaryEntry *e = NULL; int orig_nb_streams; // number of streams before avformat_find_stream_info if (o->format) { @@ -666,6 +684,39 @@ static int open_input_file(OptionsContext *o, const char *filename) f->nb_streams = ic->nb_streams; f->rate_emu = o->rate_emu; + /* check if all codec options have been used */ + unused_opts = strip_specifiers(o->g->codec_opts); + for (i = f->ist_index; i < nb_input_streams; i++) { + e = NULL; + while ((e = av_dict_get(input_streams[i]->opts, "", e, + AV_DICT_IGNORE_SUFFIX))) + av_dict_set(&unused_opts, e->key, NULL, 0); + } + + e = NULL; + while ((e = av_dict_get(unused_opts, "", e, AV_DICT_IGNORE_SUFFIX))) { + const AVClass *class = avcodec_get_class(); + const AVOption *option = av_opt_find(&class, e->key, NULL, 0, + AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ); + if (!option) + continue; + if (!(option->flags & AV_OPT_FLAG_DECODING_PARAM)) { + av_log(NULL, AV_LOG_ERROR, "Codec AVOption %s (%s) specified for " + "input file #%d (%s) is not a decoding option.\n", e->key, + option->help ? option->help : "", nb_input_files - 1, + filename); + exit(1); + } + + av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for " + "input file #%d (%s) has not been used for any stream. The most " + "likely reason is either wrong type (e.g. a video option with " + "no video streams) or that it is a private option of some decoder " + "which was not actually used for any stream.\n", e->key, + option->help ? option->help : "", nb_input_files - 1, filename); + } + av_dict_free(&unused_opts); + for (i = 0; i < o->nb_dump_attachment; i++) { int j; @@ -768,7 +819,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e exit(1); output_streams[nb_output_streams - 1] = ost; - ost->file_index = nb_output_files; + ost->file_index = nb_output_files - 1; ost->index = idx; ost->st = st; st->codec->codec_type = type; @@ -852,6 +903,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e av_dict_copy(&ost->resample_opts, o->g->resample_opts, 0); ost->pix_fmts[0] = ost->pix_fmts[1] = AV_PIX_FMT_NONE; + ost->last_mux_dts = AV_NOPTS_VALUE; return ost; } @@ -873,6 +925,59 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str) } } +/* read file contents into a string */ +static uint8_t *read_file(const char *filename) +{ + AVIOContext *pb = NULL; + AVIOContext *dyn_buf = NULL; + int ret = avio_open(&pb, filename, AVIO_FLAG_READ); + uint8_t buf[1024], *str; + + if (ret < 0) { + av_log(NULL, AV_LOG_ERROR, "Error opening file %s.\n", filename); + return NULL; + } + + ret = avio_open_dyn_buf(&dyn_buf); + if (ret < 0) { + avio_closep(&pb); + return NULL; + } + while ((ret = avio_read(pb, buf, sizeof(buf))) > 0) + avio_write(dyn_buf, buf, ret); + avio_w8(dyn_buf, 0); + avio_closep(&pb); + + ret = avio_close_dyn_buf(dyn_buf, &str); + if (ret < 0) + return NULL; + return str; +} + +static char *get_ost_filters(OptionsContext *o, AVFormatContext *oc, + OutputStream *ost) +{ + AVStream *st = ost->st; + char *filter = NULL, *filter_script = NULL; + + MATCH_PER_STREAM_OPT(filter_scripts, str, filter_script, oc, st); + MATCH_PER_STREAM_OPT(filters, str, filter, oc, st); + + if (filter_script && filter) { + av_log(NULL, AV_LOG_ERROR, "Both -filter and -filter_script set for " + "output stream #%d:%d.\n", nb_output_files, st->index); + exit(1); + } + + if (filter_script) + return read_file(filter_script); + else if (filter) + return av_strdup(filter); + + return av_strdup(st->codec->codec_type == AVMEDIA_TYPE_VIDEO ? + "null" : "anull"); +} + static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) { AVStream *st; @@ -888,7 +993,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) char *frame_rate = NULL, *frame_size = NULL; char *frame_aspect_ratio = NULL, *frame_pix_fmt = NULL; char *intra_matrix = NULL, *inter_matrix = NULL; - const char *filters = "null"; int do_pass = 0; int i; @@ -983,8 +1087,10 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc) ost->top_field_first = -1; MATCH_PER_STREAM_OPT(top_field_first, i, ost->top_field_first, oc, st); - MATCH_PER_STREAM_OPT(filters, str, filters, oc, st); - ost->avfilter = av_strdup(filters); + + ost->avfilter = get_ost_filters(o, oc, ost); + if (!ost->avfilter) + exit(1); } else { MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st); } @@ -1006,7 +1112,6 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc) if (!ost->stream_copy) { char *sample_fmt = NULL; - const char *filters = "anull"; MATCH_PER_STREAM_OPT(audio_channels, i, audio_enc->channels, oc, st); @@ -1019,8 +1124,9 @@ 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); - ost->avfilter = av_strdup(filters); + ost->avfilter = get_ost_filters(o, oc, ost); + if (!ost->avfilter) + exit(1); } return ost; @@ -1043,6 +1149,7 @@ static OutputStream *new_attachment_stream(OptionsContext *o, AVFormatContext *o { OutputStream *ost = new_output_stream(o, oc, AVMEDIA_TYPE_ATTACHMENT); ost->stream_copy = 1; + ost->finished = 1; return ost; } @@ -1179,12 +1286,27 @@ static int open_output_file(OptionsContext *o, const char *filename) OutputFile *of; OutputStream *ost; InputStream *ist; + AVDictionary *unused_opts = NULL; + AVDictionaryEntry *e = NULL; if (configure_complex_filters() < 0) { av_log(NULL, AV_LOG_FATAL, "Error configuring filters.\n"); exit(1); } + GROW_ARRAY(output_files, nb_output_files); + of = av_mallocz(sizeof(*of)); + if (!of) + exit(1); + output_files[nb_output_files - 1] = of; + + of->ost_index = nb_output_streams; + of->recording_time = o->recording_time; + of->start_time = o->start_time; + of->limit_filesize = o->limit_filesize; + of->shortest = o->shortest; + av_dict_copy(&of->opts, o->g->format_opts, 0); + if (!strcmp(filename, "-")) filename = "pipe:"; @@ -1193,6 +1315,9 @@ static int open_output_file(OptionsContext *o, const char *filename) print_error(filename, AVERROR(ENOMEM)); exit(1); } + of->ctx = oc; + if (o->recording_time != INT64_MAX) + oc->duration = o->recording_time; if (o->format) { file_oformat = av_guess_format(o->format, NULL, NULL); @@ -1368,21 +1493,38 @@ loop_end: avio_close(pb); } - GROW_ARRAY(output_files, nb_output_files); - of = av_mallocz(sizeof(*of)); - if (!of) - exit(1); - output_files[nb_output_files - 1] = of; + /* check if all codec options have been used */ + unused_opts = strip_specifiers(o->g->codec_opts); + for (i = of->ost_index; i < nb_output_streams; i++) { + e = NULL; + while ((e = av_dict_get(output_streams[i]->opts, "", e, + AV_DICT_IGNORE_SUFFIX))) + av_dict_set(&unused_opts, e->key, NULL, 0); + } - of->ctx = oc; - of->ost_index = nb_output_streams - oc->nb_streams; - of->recording_time = o->recording_time; - if (o->recording_time != INT64_MAX) - oc->duration = o->recording_time; - of->start_time = o->start_time; - of->limit_filesize = o->limit_filesize; - of->shortest = o->shortest; - av_dict_copy(&of->opts, o->g->format_opts, 0); + e = NULL; + while ((e = av_dict_get(unused_opts, "", e, AV_DICT_IGNORE_SUFFIX))) { + const AVClass *class = avcodec_get_class(); + const AVOption *option = av_opt_find(&class, e->key, NULL, 0, + AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ); + if (!option) + continue; + if (!(option->flags & AV_OPT_FLAG_ENCODING_PARAM)) { + av_log(NULL, AV_LOG_ERROR, "Codec AVOption %s (%s) specified for " + "output file #%d (%s) is not an encoding option.\n", e->key, + option->help ? option->help : "", nb_output_files - 1, + filename); + exit(1); + } + + av_log(NULL, AV_LOG_WARNING, "Codec AVOption %s (%s) specified for " + "output file #%d (%s) has not been used for any stream. The most " + "likely reason is either wrong type (e.g. a video option with " + "no video streams) or that it is a private option of some encoder " + "which was not actually used for any stream.\n", e->key, + option->help ? option->help : "", nb_output_files - 1, filename); + } + av_dict_free(&unused_opts); /* check filename in case of an image number is expected */ if (oc->oformat->flags & AVFMT_NEEDNUMBER) { @@ -1721,15 +1863,6 @@ static int opt_vsync(void *optctx, const char *opt, const char *arg) return 0; } -#if FF_API_DEINTERLACE -static int opt_deinterlace(void *optctx, const char *opt, const char *arg) -{ - av_log(NULL, AV_LOG_WARNING, "-%s is deprecated, use -filter:v yadif instead\n", opt); - do_deinterlace = 1; - return 0; -} -#endif - int opt_cpuflags(void *optctx, const char *opt, const char *arg) { int flags = av_parse_cpu_flags(arg); @@ -1788,8 +1921,24 @@ static int opt_filter_complex(void *optctx, const char *opt, const char *arg) GROW_ARRAY(filtergraphs, nb_filtergraphs); if (!(filtergraphs[nb_filtergraphs - 1] = av_mallocz(sizeof(*filtergraphs[0])))) return AVERROR(ENOMEM); - filtergraphs[nb_filtergraphs - 1]->index = nb_filtergraphs - 1; - filtergraphs[nb_filtergraphs - 1]->graph_desc = arg; + filtergraphs[nb_filtergraphs - 1]->index = nb_filtergraphs - 1; + filtergraphs[nb_filtergraphs - 1]->graph_desc = av_strdup(arg); + if (!filtergraphs[nb_filtergraphs - 1]->graph_desc) + return AVERROR(ENOMEM); + return 0; +} + +static int opt_filter_complex_script(void *optctx, const char *opt, const char *arg) +{ + uint8_t *graph_desc = read_file(arg); + if (!graph_desc) + return AVERROR(EINVAL); + + GROW_ARRAY(filtergraphs, nb_filtergraphs); + if (!(filtergraphs[nb_filtergraphs - 1] = av_mallocz(sizeof(*filtergraphs[0])))) + return AVERROR(ENOMEM); + filtergraphs[nb_filtergraphs - 1]->index = nb_filtergraphs - 1; + filtergraphs[nb_filtergraphs - 1]->graph_desc = graph_desc; return 0; } @@ -1854,6 +2003,7 @@ void show_help_default(const char *opt, const char *arg) show_help_children(avcodec_get_class(), flags); show_help_children(avformat_get_class(), flags); show_help_children(sws_get_class(), flags); + show_help_children(avfilter_get_class(), AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_AUDIO_PARAM); } } @@ -1901,7 +2051,7 @@ static int open_files(OptionGroupList *l, const char *inout, inout, g->arg); return ret; } - av_log(NULL, AV_LOG_DEBUG, "Successfully openened the file.\n"); + av_log(NULL, AV_LOG_DEBUG, "Successfully opened the file.\n"); } return 0; @@ -2048,8 +2198,12 @@ const OptionDef options[] = { "use fixed quality scale (VBR)", "q" }, { "filter", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(filters) }, "set stream filterchain", "filter_list" }, + { "filter_script", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(filter_scripts) }, + "read stream filtergraph description from a file", "filename" }, { "filter_complex", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex }, "create a complex filtergraph", "graph_description" }, + { "filter_complex_script", HAS_ARG | OPT_EXPERT, { .func_arg = opt_filter_complex_script }, + "read complex filtergraph description from a file", "filename" }, { "stats", OPT_BOOL, { &print_stats }, "print progress report during encoding", }, { "attach", HAS_ARG | OPT_PERFILE | OPT_EXPERT | @@ -2091,10 +2245,6 @@ const OptionDef options[] = { { "passlogfile", OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT | OPT_SPEC | OPT_OUTPUT, { .off = OFFSET(passlogfiles) }, "select two pass log file name prefix", "prefix" }, -#if FF_API_DEINTERLACE - { "deinterlace", OPT_VIDEO | OPT_EXPERT , { .func_arg = opt_deinterlace }, - "this option is deprecated, use the yadif filter instead" }, -#endif { "vstats", OPT_VIDEO | OPT_EXPERT , { &opt_vstats }, "dump video coding statistics to file" }, { "vstats_file", OPT_VIDEO | HAS_ARG | OPT_EXPERT , { opt_vstats_file },