starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 22:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

move auto-organize to plugin

Browse Source
This commit is contained in:
Luke Pulverenti
2017-07-27 01:18:39 -04:00
parent 6652d856f9
commit d270b10db6
29 changed files with 20 additions and 2608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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