From 25cdbf014e16c7607605ee7287adcc953bba6211 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 24 Apr 2015 23:30:44 -0400
Subject: fix refFrames not being recorded

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs          | 6 ++++--
 MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.MediaEncoding')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index d076a5b6b..a01f37f91 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -119,7 +119,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             var extractKeyFrameInterval = request.ExtractKeyFrameInterval && request.Protocol == MediaProtocol.File && request.VideoType == VideoType.VideoFile;
 
             return GetMediaInfoInternal(GetInputArgument(inputFiles, request.Protocol), request.InputPath, request.Protocol, extractChapters, extractKeyFrameInterval,
-                GetProbeSizeArgument(inputFiles, request.Protocol), request.MediaType == DlnaProfileType.Audio, cancellationToken);
+                GetProbeSizeArgument(inputFiles, request.Protocol), request.MediaType == DlnaProfileType.Audio, request.VideoType, cancellationToken);
         }
 
         /// <summary>
@@ -155,6 +155,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// <param name="extractKeyFrameInterval">if set to <c>true</c> [extract key frame interval].</param>
         /// <param name="probeSizeArgument">The probe size argument.</param>
         /// <param name="isAudio">if set to <c>true</c> [is audio].</param>
+        /// <param name="videoType">Type of the video.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{MediaInfoResult}.</returns>
         /// <exception cref="System.ApplicationException"></exception>
@@ -165,6 +166,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             bool extractKeyFrameInterval,
             string probeSizeArgument,
             bool isAudio,
+            VideoType videoType,
             CancellationToken cancellationToken)
         {
             var args = extractChapters
@@ -236,7 +238,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                         }
                     }
 
-                    var mediaInfo = new ProbeResultNormalizer(_logger, FileSystem).GetMediaInfo(result, isAudio, primaryPath, protocol);
+                    var mediaInfo = new ProbeResultNormalizer(_logger, FileSystem).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol);
 
                     if (extractKeyFrameInterval && mediaInfo.RunTimeTicks.HasValue)
                     {
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 267ff875a..2ef1c0cbd 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             _fileSystem = fileSystem;
         }
 
-        public Model.MediaInfo.MediaInfo GetMediaInfo(InternalMediaInfoResult data, bool isAudio, string path, MediaProtocol protocol)
+        public Model.MediaInfo.MediaInfo GetMediaInfo(InternalMediaInfoResult data, VideoType videoType, bool isAudio, string path, MediaProtocol protocol)
         {
             var info = new Model.MediaInfo.MediaInfo
             {
@@ -79,7 +79,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
                 var videoStream = info.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Video);
 
-                if (videoStream != null)
+                if (videoStream != null && videoType == VideoType.VideoFile)
                 {
                     UpdateFromMediaInfo(info, videoStream);
                 }
@@ -863,12 +863,14 @@ namespace MediaBrowser.MediaEncoding.Probing
 
         private void UpdateFromMediaInfo(MediaSourceInfo video, MediaStream videoStream)
         {
-            if (video.VideoType == VideoType.VideoFile && video.Protocol == MediaProtocol.File)
+            if (video.Protocol == MediaProtocol.File)
             {
                 if (videoStream != null)
                 {
                     try
                     {
+                        _logger.Debug("Running MediaInfo against {0}", video.Path);
+
                         var result = new MediaInfoLib().GetVideoInfo(video.Path);
 
                         videoStream.IsCabac = result.IsCabac ?? videoStream.IsCabac;
-- 
cgit v1.2.3