3 files changed, 25 insertions, 36 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index e97898ac5..9761de98f 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -1,18 +1,10 @@
-using MediaBrowser.Controller.Library;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Net;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Encoder
@@ -153,7 +145,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             var ticks = transcodingPosition.HasValue ? transcodingPosition.Value.Ticks : (long?)null;
 
-            //    job.Framerate = framerate;
+            //job.Framerate = framerate;
 
             if (!percentComplete.HasValue && ticks.HasValue && RunTimeTicks.HasValue)
             {
@@ -166,8 +158,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 Progress.Report(percentComplete.Value);
             }
 
-            //    job.TranscodingPositionTicks = ticks;
-            //    job.BytesTranscoded = bytesTranscoded;
+            /*
+            job.TranscodingPositionTicks = ticks;
+            job.BytesTranscoded = bytesTranscoded;
 
             var deviceId = Options.DeviceId;
 
@@ -176,21 +169,21 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 var audioCodec = ActualOutputVideoCodec;
                 var videoCodec = ActualOutputVideoCodec;
 
-                //    SessionManager.ReportTranscodingInfo(deviceId, new TranscodingInfo
-                //    {
-                //        Bitrate = job.TotalOutputBitrate,
-                //        AudioCodec = audioCodec,
-                //        VideoCodec = videoCodec,
-                //        Container = job.Options.OutputContainer,
-                //        Framerate = framerate,
-                //        CompletionPercentage = percentComplete,
-                //        Width = job.OutputWidth,
-                //        Height = job.OutputHeight,
-                //        AudioChannels = job.OutputAudioChannels,
-                //        IsAudioDirect = string.Equals(job.OutputAudioCodec, "copy", StringComparison.OrdinalIgnoreCase),
-                //        IsVideoDirect = string.Equals(job.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase)
-                //    });
-            }
+                SessionManager.ReportTranscodingInfo(deviceId, new TranscodingInfo
+                {
+                    Bitrate = job.TotalOutputBitrate,
+                    AudioCodec = audioCodec,
+                    VideoCodec = videoCodec,
+                    Container = job.Options.OutputContainer,
+                    Framerate = framerate,
+                    CompletionPercentage = percentComplete,
+                    Width = job.OutputWidth,
+                    Height = job.OutputHeight,
+                    AudioChannels = job.OutputAudioChannels,
+                    IsAudioDirect = string.Equals(job.OutputAudioCodec, "copy", StringComparison.OrdinalIgnoreCase),
+                    IsVideoDirect = string.Equals(job.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase)
+                });
+            }*/
         }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs b/MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs
index d2cf7f395..c62de0b11 100644
--- a/MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs
@@ -3,15 +3,12 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Common.Configuration;
-
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Progress;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Net;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index a661d7691..181fc0f65 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -6,7 +6,6 @@ using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.MediaEncoding.Probing;
 using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
@@ -550,7 +549,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 {
                     //process.BeginErrorReadLine();
 
-                    var result = _jsonSerializer.DeserializeFromStream<InternalMediaInfoResult>(process.StandardOutput.BaseStream);
+                    var result = await _jsonSerializer.DeserializeFromStreamAsync<InternalMediaInfoResult>(process.StandardOutput.BaseStream).ConfigureAwait(false);
 
                     if (result == null || (result.streams == null && result.format == null))
                     {