alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-16 07:12:18 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into bdiso-playback

Browse Source
This commit is contained in:
Stan
2020-10-28 13:18:05 +01:00
committed by GitHub
parent cd4641dca0 be2f27a069
commit 3bb8884e16
309 changed files with 4116 additions and 7046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@@ -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))
{