michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4369 from orryverducci/mkv-interlaced-fix

Browse Source 
Fix frame rate probing for interlaced MKV files
This commit is contained in:
Bond-009 2020-10-25 21:26:04 +01:00 committed by GitHub
commit 655a4f8600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats 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.AverageFrameRate = GetFrameRate(streamInfo.AverageFrameRate);
stream.RealFrameRate = GetFrameRate(streamInfo.RFrameRate); 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) || if (isAudio || string.Equals(stream.Codec, "gif", StringComparison.OrdinalIgnoreCase) ||
string.Equals(stream.Codec, "png", StringComparison.OrdinalIgnoreCase)) string.Equals(stream.Codec, "png", StringComparison.OrdinalIgnoreCase))
{ {