Merge pull request #2726 from MediaBrowser/dev

Dev

4 files changed, 29 insertions, 5 deletions

diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index d98638d55..2832462a8 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -33,6 +33,8 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>ImageSize.</returns>
         ImageSize GetImageSize(ItemImageInfo info);
 
+        ImageSize GetImageSize(ItemImageInfo info, bool allowSlowMethods);
+
         /// <summary>
         /// Gets the size of the image.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 34b33fde0..ea442ba1e 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -487,7 +487,7 @@ namespace MediaBrowser.Controller.Entities
                     var folder = this;
                     innerProgress.RegisterAction(p =>
                     {
-                        double newPct = .70 * p + 10;
+                        double newPct = .80 * p + 10;
                         progress.Report(newPct);
                         ProviderManager.OnRefreshProgress(folder, newPct);
                     });
@@ -498,11 +498,11 @@ namespace MediaBrowser.Controller.Entities
 
             if (refreshChildMetadata)
             {
-                progress.Report(80);
+                progress.Report(90);
 
                 if (recursive)
                 {
-                    ProviderManager.OnRefreshProgress(this, 80);
+                    ProviderManager.OnRefreshProgress(this, 90);
                 }
 
                 var container = this as IMetadataContainer;
@@ -512,7 +512,7 @@ namespace MediaBrowser.Controller.Entities
                     var folder = this;
                     innerProgress.RegisterAction(p =>
                     {
-                        double newPct = .20 * p + 80;
+                        double newPct = .10 * p + 90;
                         progress.Report(newPct);
                         if (recursive)
                         {
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 57c81ddf7..a83a6a15e 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
@@ -9,6 +10,7 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Drawing;
+using MediaBrowser.Model.Session;
 
 namespace MediaBrowser.Controller.MediaEncoding
 {
@@ -40,6 +42,24 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public bool ReadInputAtNativeFramerate { get; set; }
 
+        private List<TranscodeReason> _transcodeReasons = null;
+        public List<TranscodeReason> TranscodeReasons
+        {
+            get
+            {
+                if (_transcodeReasons == null)
+                {
+                    _transcodeReasons = (BaseRequest.TranscodeReasons ?? string.Empty)
+                        .Split(',')
+                        .Where(i => !string.IsNullOrWhiteSpace(i))
+                        .Select(v => (TranscodeReason)Enum.Parse(typeof(TranscodeReason), v, true))
+                        .ToList();
+                }
+
+                return _transcodeReasons;
+            }
+        }
+
         public bool IgnoreInputDts
         {
             get
@@ -251,7 +271,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     {
                         return AudioStream.SampleRate;
                     }
-                } 
+                }
 
                 else if (BaseRequest.AudioSampleRate.HasValue)
                 {
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
index 632c350ad..28ef66566 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
@@ -204,6 +204,8 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public string SubtitleCodec { get; set; }
 
+        public string TranscodeReasons { get; set; }
+
         /// <summary>
         /// Gets or sets the index of the audio stream.
         /// </summary>