diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-07-27 01:21:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 01:21:30 -0400 |
| commit | 76affb41b0fedc89b9eeb52cbd25a661c8beb486 (patch) | |
| tree | 14ed05412fd182e756f3558c9e18e39e42faf679 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | ce6d403689604def0afdc54aa6fe174488367081 (diff) | |
| parent | d0aa25f0295580303cffddb9539b50a05a22b41f (diff) | |
Merge pull request #2779 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index f1bf29d92..f416ea417 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -597,21 +597,7 @@ namespace MediaBrowser.MediaEncoding.Encoder } } - var mediaInfo = new ProbeResultNormalizer(_logger, FileSystem, _memoryStreamProvider).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol); - - var videoStream = mediaInfo.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Video); - - if (videoStream != null && !videoStream.IsInterlaced) - { - var isInterlaced = DetectInterlaced(mediaInfo, videoStream); - - if (isInterlaced) - { - videoStream.IsInterlaced = true; - } - } - - return mediaInfo; + return new ProbeResultNormalizer(_logger, FileSystem, _memoryStreamProvider).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol); } catch { @@ -622,23 +608,6 @@ namespace MediaBrowser.MediaEncoding.Encoder } } - private bool DetectInterlaced(MediaSourceInfo video, MediaStream videoStream) - { - // If it's mpeg based, assume true - if ((videoStream.Codec ?? string.Empty).IndexOf("mpeg", StringComparison.OrdinalIgnoreCase) != -1) - { - var formats = (video.Container ?? string.Empty).Split(',').ToList(); - return 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); - - } - - return false; - } - /// <summary> /// The us culture /// </summary> |