diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 15:03:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 15:25:34 +0200 |
| commit | c7cfd4cce98a858c08e880ac7075737c78f98be8 (patch) | |
| tree | 2a9fba99dd5ac14d04e954a28b364b8f4a67153f | |
| parent | 19d416333114bd9bc2a76132709bf0a4463605bd (diff) | |
| download | ffmpeg-c7cfd4cce98a858c08e880ac7075737c78f98be8.tar.gz | |
avformat_find_stream_info: use fps_dts as last resort to determine duration
Fixes long delay with some hardware generated h264 in ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 6acc7c848c..c6aa87b506 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2829,6 +2829,15 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) if (st->avg_frame_rate.num > 0) t = FFMAX(t, av_rescale_q(st->codec_info_nb_frames, av_inv_q(st->avg_frame_rate), AV_TIME_BASE_Q)); + if ( t==0 + && st->codec_info_nb_frames>15 + && st->codec->codec_type == AVMEDIA_TYPE_VIDEO + && ( !strcmp(ic->iformat->name, "mpeg") // this breaks some flvs thus use only for mpegps/ts for now (for ts we have a sample that needs it) + || !strcmp(ic->iformat->name, "mpegts")) + && st->info->fps_first_dts != AV_NOPTS_VALUE + && st->info->fps_last_dts != AV_NOPTS_VALUE) + t = FFMAX(t, av_rescale_q(st->info->fps_last_dts - st->info->fps_first_dts, st->time_base, AV_TIME_BASE_Q)); + if (t >= ic->max_analyze_duration) { av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %d reached at %"PRId64" microseconds\n", ic->max_analyze_duration, t); break; |