diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-10-31 12:41:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-31 12:41:03 +0000 |
| commit | c54bdb4a0af1b132601b557ed2a9f4a76a4893cc (patch) | |
| tree | be6bc5bd549336584e3740ab9a4f3e8df5349de7 /MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs | |
| parent | 3ae37deea8a84edfc0281c984027f8a8145c7a9c (diff) | |
| parent | 4f320308f333507a324740248c7dd025085a7d67 (diff) | |
Merge pull request #86 from jellyfin/master
Updating from master
Diffstat (limited to 'MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs index 22537a4d9..cdeefbbbd 100644 --- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs +++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs @@ -666,6 +666,16 @@ namespace MediaBrowser.MediaEncoding.Probing stream.AverageFrameRate = GetFrameRate(streamInfo.AverageFrameRate); stream.RealFrameRate = GetFrameRate(streamInfo.RFrameRate); + // Interlaced video streams in Matroska containers return the field rate instead of the frame rate + // as both the average and real frame rate, so we half the returned frame rates to get the correct values + // + // https://gitlab.com/mbunkus/mkvtoolnix/-/wikis/Wrong-frame-rate-displayed + if (stream.IsInterlaced && formatInfo.FormatName.Contains("matroska", StringComparison.OrdinalIgnoreCase)) + { + stream.AverageFrameRate /= 2; + stream.RealFrameRate /= 2; + } + if (isAudio || string.Equals(stream.Codec, "gif", StringComparison.OrdinalIgnoreCase) || string.Equals(stream.Codec, "png", StringComparison.OrdinalIgnoreCase)) { |