Merge pull request #1337 from MediaBrowser/mediainfo

Mediainfo

1 files changed, 1 insertions, 35 deletions

diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index d4df19af2..d9fda220d 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -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
             {
@@ -104,13 +103,6 @@ namespace MediaBrowser.MediaEncoding.Probing
                 }
 
                 ExtractTimestamp(info);
-
-                var videoStream = info.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Video);
-
-                if (videoStream != null && videoType == VideoType.VideoFile)
-                {
-                    UpdateFromMediaInfo(info, videoStream);
-                }
             }
 
             return info;
@@ -933,31 +925,5 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             return TransportStreamTimestamp.None;
         }
-
-        private void UpdateFromMediaInfo(MediaSourceInfo video, MediaStream videoStream)
-        {
-            if (video.Protocol == MediaProtocol.File && videoStream != null)
-            {
-                try
-                {
-                    _logger.Debug("Running MediaInfo against {0}", video.Path);
-
-                    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);
-                }
-            }
-        }
     }
 }