From 45398959d765838256880f25c3d18470518798ce Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 31 Jan 2017 16:25:29 -0500 Subject: [PATCH] update media probe --- .../Encoder/MediaEncoder.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index a0f5c129b7..ee3482a70b 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -699,16 +699,6 @@ namespace MediaBrowser.MediaEncoding.Encoder private async Task DetectInterlaced(MediaSourceInfo video, MediaStream videoStream, string inputPath, string probeSizeArgument) { - if (video.Protocol != MediaProtocol.File) - { - // If it's mpeg based, assume true - if ((videoStream.Codec ?? string.Empty).IndexOf("mpeg", StringComparison.OrdinalIgnoreCase) != -1) - { - return true; - } - return false; - } - var formats = (video.Container ?? string.Empty).Split(',').ToList(); var enableInterlacedDection = formats.Contains("vob", StringComparer.OrdinalIgnoreCase) || formats.Contains("m2ts", StringComparer.OrdinalIgnoreCase) || @@ -733,6 +723,16 @@ namespace MediaBrowser.MediaEncoding.Encoder } } + if (video.Protocol != MediaProtocol.File) + { + // If it's mpeg based, assume true + if ((videoStream.Codec ?? string.Empty).IndexOf("mpeg", StringComparison.OrdinalIgnoreCase) != -1) + { + return true; + } + return false; + } + var args = "{0} -i {1} -map 0:v:{2} -an -filter:v idet -frames:v 500 -an -f null /dev/null"; var process = _processFactory.Create(new ProcessOptions