RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: add -(no)find_stream_info expert option

This commit is contained in:
Clément Bœsch 2017-07-12 11:06:52 +02:00 committed by Clément Bœsch
parent 04a8e03ef0
commit b7a741223d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ffmpeg_opt.c
View File

@ -145,6 +145,7 @@ static int override_ffserver = 0;
static int input_stream_potentially_available = 0; static int input_stream_potentially_available = 0;
static int ignore_unknown_streams = 0; static int ignore_unknown_streams = 0;
static int copy_unknown_streams = 0; static int copy_unknown_streams = 0;
static int find_stream_info = 1;
static void uninit_options(OptionsContext *o) static void uninit_options(OptionsContext *o)
{ {
@ -949,10 +950,8 @@ static int open_input_file(OptionsContext *o, const char *filename)
AVInputFormat *file_iformat = NULL; AVInputFormat *file_iformat = NULL;
int err, i, ret; int err, i, ret;
int64_t timestamp; int64_t timestamp;
AVDictionary **opts;
AVDictionary *unused_opts = NULL; AVDictionary *unused_opts = NULL;
AVDictionaryEntry *e = NULL; AVDictionaryEntry *e = NULL;
int orig_nb_streams; // number of streams before avformat_find_stream_info
char * video_codec_name = NULL; char * video_codec_name = NULL;
char * audio_codec_name = NULL; char * audio_codec_name = NULL;
char *subtitle_codec_name = NULL; char *subtitle_codec_name = NULL;
@ -1055,13 +1054,19 @@ static int open_input_file(OptionsContext *o, const char *filename)
for (i = 0; i < ic->nb_streams; i++) for (i = 0; i < ic->nb_streams; i++)
choose_decoder(o, ic, ic->streams[i]); choose_decoder(o, ic, ic->streams[i]);
/* Set AVCodecContext options for avformat_find_stream_info */ if (find_stream_info) {
opts = setup_find_stream_info_opts(ic, o->g->codec_opts); AVDictionary **opts = setup_find_stream_info_opts(ic, o->g->codec_opts);
orig_nb_streams = ic->nb_streams; int orig_nb_streams = ic->nb_streams;
// TODO: reindent
/* If not enough info to get the stream parameters, we decode the /* If not enough info to get the stream parameters, we decode the
first frames to get it. (used in mpeg case for example) */ first frames to get it. (used in mpeg case for example) */
ret = avformat_find_stream_info(ic, opts); ret = avformat_find_stream_info(ic, opts);
for (i = 0; i < orig_nb_streams; i++)
av_dict_free(&opts[i]);
av_freep(&opts);
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename); av_log(NULL, AV_LOG_FATAL, "%s: could not find codec parameters\n", filename);
if (ic->nb_streams == 0) { if (ic->nb_streams == 0) {
@ -1069,6 +1074,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
exit_program(1); exit_program(1);
} }
} }
}
if (o->start_time_eof != AV_NOPTS_VALUE) { if (o->start_time_eof != AV_NOPTS_VALUE) {
if (ic->duration>0) { if (ic->duration>0) {
@ -1180,10 +1186,6 @@ static int open_input_file(OptionsContext *o, const char *filename)
} }
} }
for (i = 0; i < orig_nb_streams; i++)
av_dict_free(&opts[i]);
av_freep(&opts);
input_stream_potentially_available = 1; input_stream_potentially_available = 1;
return 0; return 0;
@ -3520,6 +3522,8 @@ const OptionDef options[] = {
{ "thread_queue_size", HAS_ARG | OPT_INT | OPT_OFFSET | OPT_EXPERT | OPT_INPUT, { "thread_queue_size", HAS_ARG | OPT_INT | OPT_OFFSET | OPT_EXPERT | OPT_INPUT,
{ .off = OFFSET(thread_queue_size) }, { .off = OFFSET(thread_queue_size) },
"set the maximum number of queued packets from the demuxer" }, "set the maximum number of queued packets from the demuxer" },
{ "find_stream_info", OPT_BOOL | OPT_PERFILE | OPT_INPUT | OPT_EXPERT, { &find_stream_info },
"read and decode the streams to fill missing information with heuristics" },
/* video options */ /* video options */
{ "vframes", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_video_frames }, { "vframes", OPT_VIDEO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_video_frames },