diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-22 23:06:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-22 23:28:14 +0200 |
| commit | 9dbf21fd28991898e61020de0809497999282562 (patch) | |
| tree | fa003cb0d22fb6e0c076f6385615899524a5c1af /src/lib/ffmpeg.cc | |
| parent | 3c29aa6531a4046a8db72dcac81189eb8893233c (diff) | |
Improve rejection of "crazy" frame rates (#2238).
Firstly, look for other video streams even if one is not suitable.
Secondly, ignore very low frame rates as well as very high ones.
Diffstat (limited to 'src/lib/ffmpeg.cc')
| -rw-r--r-- | src/lib/ffmpeg.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index a54b4fc01..6c8509b6c 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -149,6 +149,11 @@ FFmpeg::setup_general () for (uint32_t i = 0; i < _format_context->nb_streams; ++i) { auto s = _format_context->streams[i]; if (s->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codecpar->codec_id)) { + auto const frame_rate = av_q2d(s->avg_frame_rate); + if (frame_rate < 1 || frame_rate > 1000) { + /* Ignore video streams with crazy frame rates. These are usually things like album art on MP3s. */ + continue; + } if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) { /* This is definitely our video stream */ _video_stream = i; @@ -166,11 +171,6 @@ FFmpeg::setup_general () _video_stream = video_stream_undefined_frame_rate.get(); } - /* Ignore video streams with crazy frame rates. These are usually things like album art on MP3s. */ - if (_video_stream && av_q2d(av_guess_frame_rate(_format_context, _format_context->streams[_video_stream.get()], 0)) > 1000) { - _video_stream = optional<int>(); - } - /* Hack: if the AVStreams have duplicate IDs, replace them with our own. We use the IDs so that we can cope with VOBs, in which streams move about in index but remain with the same ID in different |