starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-19 23:35:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove MediaInfo

Browse Source
This commit is contained in:
Luke Pulverenti
2015-12-19 10:51:38 -05:00
parent be664f93c6
commit 6414fc9486
10 changed files with 11 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@@ -1,5 +1,4 @@
using MediaBrowser.Common.IO;
using MediaBrowser.MediaInfo;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Extensions;
@@ -26,7 +25,7 @@ namespace MediaBrowser.MediaEncoding.Probing
_fileSystem = fileSystem;
}
public Model.MediaInfo.MediaInfo GetMediaInfo(InternalMediaInfoResult data, VideoType videoType, bool isAudio, string path, MediaProtocol protocol)
public MediaInfo GetMediaInfo(InternalMediaInfoResult data, VideoType videoType, bool isAudio, string path, MediaProtocol protocol)
{
var info = new Model.MediaInfo.MediaInfo
{
@@ -109,7 +108,7 @@ namespace MediaBrowser.MediaEncoding.Probing
if (videoStream != null && videoType == VideoType.VideoFile)
{
UpdateFromMediaInfo(info, videoStream);
DetectInterlaced(info, videoStream);
}
}
@@ -934,29 +933,18 @@ namespace MediaBrowser.MediaEncoding.Probing
return TransportStreamTimestamp.None;
}
private void UpdateFromMediaInfo(MediaSourceInfo video, MediaStream videoStream)
private void DetectInterlaced(MediaSourceInfo video, MediaStream videoStream)
{
if (video.Protocol == MediaProtocol.File && videoStream != null)
if (video.Protocol != MediaProtocol.File || videoStream == null)
{
try
{
_logger.Debug("Running MediaInfo against {0}", video.Path);
return;
}
var result = new MediaInfoLib().GetVideoInfo(video.Path);
videoStream.IsCabac = result.IsCabac ?? videoStream.IsCabac;
videoStream.IsInterlaced = result.IsInterlaced ?? videoStream.IsInterlaced;
videoStream.BitDepth = result.BitDepth ?? videoStream.BitDepth;
videoStream.RefFrames = result.RefFrames ?? videoStream.RefFrames;
}
catch (TypeLoadException)
{
// This is non-essential. Don't spam the log
}
catch (Exception ex)
{
_logger.ErrorException("Error running MediaInfo on {0}", ex, video.Path);
}
// Take a shortcut and limit this to containers that are likely to have interlaced content
if (!string.Equals(video.Container, "ts", StringComparison.OrdinalIgnoreCase) &&
!string.Equals(video.Container, "wtv", StringComparison.OrdinalIgnoreCase))
{
return;
}
}
}