lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update interlaced detection

Browse Source
This commit is contained in:
Luke Pulverenti 2016-02-01 12:02:58 -05:00
parent 552694bb38
commit 025958a22d
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -292,16 +292,25 @@ namespace MediaBrowser.MediaEncoding.Encoder
return false; return false;
} }
// If the video codec is not some form of mpeg, then take a shortcut and limit this to containers that are likely to have interlaced content
if ((videoStream.Codec ?? string.Empty).IndexOf("mpeg", StringComparison.OrdinalIgnoreCase) == -1)
{
var formats = (video.Container ?? string.Empty).Split(',').ToList(); var formats = (video.Container ?? string.Empty).Split(',').ToList();
var enableInterlacedDection = formats.Contains("vob", StringComparer.OrdinalIgnoreCase) &&
formats.Contains("m2ts", StringComparer.OrdinalIgnoreCase) &&
formats.Contains("ts", StringComparer.OrdinalIgnoreCase) &&
formats.Contains("mpegts", StringComparer.OrdinalIgnoreCase) &&
formats.Contains("wtv", StringComparer.OrdinalIgnoreCase);
if (!formats.Contains("vob", StringComparer.OrdinalIgnoreCase) && // If it's mpeg based, assume true
!formats.Contains("m2ts", StringComparer.OrdinalIgnoreCase) && if ((videoStream.Codec ?? string.Empty).IndexOf("mpeg", StringComparison.OrdinalIgnoreCase) != -1)
!formats.Contains("ts", StringComparer.OrdinalIgnoreCase) && {
!formats.Contains("mpegts", StringComparer.OrdinalIgnoreCase) && if (enableInterlacedDection)
!formats.Contains("wtv", StringComparer.OrdinalIgnoreCase)) {
return true;
}
}
else
{
// If the video codec is not some form of mpeg, then take a shortcut and limit this to containers that are likely to have interlaced content
if (!enableInterlacedDection)
{ {
return false; return false;
} }