Merge pull request #1 from jellyfin/dev

Update from jellyfin repo

1 files changed, 14 insertions, 54 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index 1edc5c201..d4040cd31 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Library;
@@ -15,43 +15,30 @@ namespace MediaBrowser.MediaEncoding.Encoder
         public bool IsCancelled { get; internal set; }
 
         public Stream LogFileStream { get; set; }
-        public IProgress<double> Progress { get; set; }
         public TaskCompletionSource<bool> TaskCompletionSource;
 
         public EncodingJobOptions Options
         {
-            get { return (EncodingJobOptions) BaseRequest; }
-            set { BaseRequest = value; }
+            get => (EncodingJobOptions)BaseRequest;
+            set => BaseRequest = value;
         }
 
-        public string Id { get; set; }
+        public Guid Id { get; set; }
 
-        public string MimeType { get; set; }
         public bool EstimateContentLength { get; set; }
         public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
-        public long? EncodingDurationTicks { get; set; }
 
         public string ItemType { get; set; }
 
-        public string GetMimeType(string outputPath)
-        {
-            if (!string.IsNullOrEmpty(MimeType))
-            {
-                return MimeType;
-            }
-
-            return MimeTypes.GetMimeType(outputPath);
-        }
-
         private readonly ILogger _logger;
         private readonly IMediaSourceManager _mediaSourceManager;
 
         public EncodingJob(ILogger logger, IMediaSourceManager mediaSourceManager) :
-            base(logger, mediaSourceManager, TranscodingJobType.Progressive)
+            base(TranscodingJobType.Progressive)
         {
             _logger = logger;
             _mediaSourceManager = mediaSourceManager;
-            Id = Guid.NewGuid().ToString("N");
+            Id = Guid.NewGuid();
 
             _logger = logger;
             TaskCompletionSource = new TaskCompletionSource<bool>();
@@ -61,6 +48,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             DisposeLiveStream();
             DisposeLogStream();
+            DisposeIsoMount();
         }
 
         private void DisposeLogStream()
@@ -95,49 +83,21 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
         }
 
-        public string OutputFilePath { get; set; }
 
-        public string ActualOutputVideoCodec
+        private void DisposeIsoMount()
         {
-            get
+            if (IsoMount != null)
             {
-                var codec = OutputVideoCodec;
-
-                if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
+                try
                 {
-                    var stream = VideoStream;
-
-                    if (stream != null)
-                    {
-                        return stream.Codec;
-                    }
-
-                    return null;
+                    IsoMount.Dispose();
                 }
-
-                return codec;
-            }
-        }
-
-        public string ActualOutputAudioCodec
-        {
-            get
-            {
-                var codec = OutputAudioCodec;
-
-                if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
+                catch (Exception ex)
                 {
-                    var stream = AudioStream;
-
-                    if (stream != null)
-                    {
-                        return stream.Codec;
-                    }
-
-                    return null;
+                    _logger.LogError("Error disposing iso mount", ex);
                 }
 
-                return codec;
+                IsoMount = null;
             }
         }