Port MediaEncoding and Api.Playback from 10e57ce8d21b4516733894075001819f3cd6db6b

MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs

@@ -0,0 +1,62 @@
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using System;
+using MediaBrowser.Model.Diagnostics;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class AudioEncoder : BaseEncoder
+    {
+        public AudioEncoder(MediaEncoder mediaEncoder, ILogger logger, IServerConfigurationManager configurationManager, IFileSystem fileSystem, IIsoManager isoManager, ILibraryManager libraryManager, ISessionManager sessionManager, ISubtitleEncoder subtitleEncoder, IMediaSourceManager mediaSourceManager, IProcessFactory processFactory) : base(mediaEncoder, logger, configurationManager, fileSystem, isoManager, libraryManager, sessionManager, subtitleEncoder, mediaSourceManager, processFactory)
+        {
+        }
+
+        protected override string GetCommandLineArguments(EncodingJob state)
+        {
+            var encodingOptions = GetEncodingOptions();
+
+            return EncodingHelper.GetProgressiveAudioFullCommandLine(state, encodingOptions, state.OutputFilePath);
+        }
+
+        protected override string GetOutputFileExtension(EncodingJob state)
+        {
+            var ext = base.GetOutputFileExtension(state);
+
+            if (!string.IsNullOrEmpty(ext))
+            {
+                return ext;
+            }
+
+            var audioCodec = state.Options.AudioCodec;
+
+            if (string.Equals("aac", audioCodec, StringComparison.OrdinalIgnoreCase))
+            {
+                return ".aac";
+            }
+            if (string.Equals("mp3", audioCodec, StringComparison.OrdinalIgnoreCase))
+            {
+                return ".mp3";
+            }
+            if (string.Equals("vorbis", audioCodec, StringComparison.OrdinalIgnoreCase))
+            {
+                return ".ogg";
+            }
+            if (string.Equals("wma", audioCodec, StringComparison.OrdinalIgnoreCase))
+            {
+                return ".wma";
+            }
+
+            return null;
+        }
+
+        protected override bool IsVideoEncoder
+        {
+            get { return false; }
+        }
+
+    }
+}

MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs

@@ -0,0 +1,375 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.MediaInfo;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Diagnostics;
+using MediaBrowser.Model.Dlna;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public abstract class BaseEncoder
+    {
+        protected readonly MediaEncoder MediaEncoder;
+        protected readonly ILogger Logger;
+        protected readonly IServerConfigurationManager ConfigurationManager;
+        protected readonly IFileSystem FileSystem;
+        protected readonly IIsoManager IsoManager;
+        protected readonly ILibraryManager LibraryManager;
+        protected readonly ISessionManager SessionManager;
+        protected readonly ISubtitleEncoder SubtitleEncoder;
+        protected readonly IMediaSourceManager MediaSourceManager;
+        protected IProcessFactory ProcessFactory;
+
+        protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
+        protected EncodingHelper EncodingHelper;
+
+        protected BaseEncoder(MediaEncoder mediaEncoder,
+            ILogger logger,
+            IServerConfigurationManager configurationManager,
+            IFileSystem fileSystem,
+            IIsoManager isoManager,
+            ILibraryManager libraryManager,
+            ISessionManager sessionManager,
+            ISubtitleEncoder subtitleEncoder,
+            IMediaSourceManager mediaSourceManager, IProcessFactory processFactory)
+        {
+            MediaEncoder = mediaEncoder;
+            Logger = logger;
+            ConfigurationManager = configurationManager;
+            FileSystem = fileSystem;
+            IsoManager = isoManager;
+            LibraryManager = libraryManager;
+            SessionManager = sessionManager;
+            SubtitleEncoder = subtitleEncoder;
+            MediaSourceManager = mediaSourceManager;
+            ProcessFactory = processFactory;
+
+            EncodingHelper = new EncodingHelper(MediaEncoder, FileSystem, SubtitleEncoder);
+        }
+
+        public async Task<EncodingJob> Start(EncodingJobOptions options,
+            IProgress<double> progress,
+            CancellationToken cancellationToken)
+        {
+            var encodingJob = await new EncodingJobFactory(Logger, LibraryManager, MediaSourceManager, ConfigurationManager, MediaEncoder)
+                .CreateJob(options, EncodingHelper, IsVideoEncoder, progress, cancellationToken).ConfigureAwait(false);
+
+            encodingJob.OutputFilePath = GetOutputFilePath(encodingJob);
+            FileSystem.CreateDirectory(FileSystem.GetDirectoryName(encodingJob.OutputFilePath));
+
+            encodingJob.ReadInputAtNativeFramerate = options.ReadInputAtNativeFramerate;
+
+            await AcquireResources(encodingJob, cancellationToken).ConfigureAwait(false);
+
+            var commandLineArgs = GetCommandLineArguments(encodingJob);
+
+            var process = ProcessFactory.Create(new ProcessOptions
+            {
+                CreateNoWindow = true,
+                UseShellExecute = false,
+
+                // Must consume both stdout and stderr or deadlocks may occur
+                //RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                RedirectStandardInput = true,
+
+                FileName = MediaEncoder.EncoderPath,
+                Arguments = commandLineArgs,
+
+                IsHidden = true,
+                ErrorDialog = false,
+                EnableRaisingEvents = true
+            });
+
+            var workingDirectory = GetWorkingDirectory(options);
+            if (!string.IsNullOrWhiteSpace(workingDirectory))
+            {
+                process.StartInfo.WorkingDirectory = workingDirectory;
+            }
+
+            OnTranscodeBeginning(encodingJob);
+
+            var commandLineLogMessage = process.StartInfo.FileName + " " + process.StartInfo.Arguments;
+            Logger.Info(commandLineLogMessage);
+
+            var logFilePath = Path.Combine(ConfigurationManager.CommonApplicationPaths.LogDirectoryPath, "transcode-" + Guid.NewGuid() + ".txt");
+            FileSystem.CreateDirectory(FileSystem.GetDirectoryName(logFilePath));
+
+            // FFMpeg writes debug/error info to stderr. This is useful when debugging so let's put it in the log directory.
+            encodingJob.LogFileStream = FileSystem.GetFileStream(logFilePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true);
+
+            var commandLineLogMessageBytes = Encoding.UTF8.GetBytes(commandLineLogMessage + Environment.NewLine + Environment.NewLine);
+            await encodingJob.LogFileStream.WriteAsync(commandLineLogMessageBytes, 0, commandLineLogMessageBytes.Length, cancellationToken).ConfigureAwait(false);
+
+            process.Exited += (sender, args) => OnFfMpegProcessExited(process, encodingJob);
+
+            try
+            {
+                process.Start();
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error starting ffmpeg", ex);
+
+                OnTranscodeFailedToStart(encodingJob.OutputFilePath, encodingJob);
+
+                throw;
+            }
+
+            cancellationToken.Register(() => Cancel(process, encodingJob));
+
+            // MUST read both stdout and stderr asynchronously or a deadlock may occurr
+            //process.BeginOutputReadLine();
+
+            // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
+            new JobLogger(Logger).StartStreamingLog(encodingJob, process.StandardError.BaseStream, encodingJob.LogFileStream);
+
+            // Wait for the file to exist before proceeeding
+            while (!FileSystem.FileExists(encodingJob.OutputFilePath) && !encodingJob.HasExited)
+            {
+                await Task.Delay(100, cancellationToken).ConfigureAwait(false);
+            }
+
+            return encodingJob;
+        }
+
+        private void Cancel(IProcess process, EncodingJob job)
+        {
+            Logger.Info("Killing ffmpeg process for {0}", job.OutputFilePath);
+
+            //process.Kill();
+            process.StandardInput.WriteLine("q");
+
+            job.IsCancelled = true;
+        }
+
+        /// <summary>
+        /// Processes the exited.
+        /// </summary>
+        /// <param name="process">The process.</param>
+        /// <param name="job">The job.</param>
+        private void OnFfMpegProcessExited(IProcess process, EncodingJob job)
+        {
+            job.HasExited = true;
+
+            Logger.Debug("Disposing stream resources");
+            job.Dispose();
+
+            var isSuccesful = false;
+
+            try
+            {
+                var exitCode = process.ExitCode;
+                Logger.Info("FFMpeg exited with code {0}", exitCode);
+
+                isSuccesful = exitCode == 0;
+            }
+            catch
+            {
+                Logger.Error("FFMpeg exited with an error.");
+            }
+
+            if (isSuccesful && !job.IsCancelled)
+            {
+                job.TaskCompletionSource.TrySetResult(true);
+            }
+            else if (job.IsCancelled)
+            {
+                try
+                {
+                    DeleteFiles(job);
+                }
+                catch
+                {
+                }
+                try
+                {
+                    job.TaskCompletionSource.TrySetException(new OperationCanceledException());
+                }
+                catch
+                {
+                }
+            }
+            else
+            {
+                try
+                {
+                    DeleteFiles(job);
+                }
+                catch
+                {
+                }
+                try
+                {
+                    job.TaskCompletionSource.TrySetException(new Exception("Encoding failed"));
+                }
+                catch
+                {
+                }
+            }
+
+            // This causes on exited to be called twice:
+            //try
+            //{
+            //    // Dispose the process
+            //    process.Dispose();
+            //}
+            //catch (Exception ex)
+            //{
+            //    Logger.ErrorException("Error disposing ffmpeg.", ex);
+            //}
+        }
+
+        protected virtual void DeleteFiles(EncodingJob job)
+        {
+            FileSystem.DeleteFile(job.OutputFilePath);
+        }
+
+        private void OnTranscodeBeginning(EncodingJob job)
+        {
+            job.ReportTranscodingProgress(null, null, null, null, null);
+        }
+
+        private void OnTranscodeFailedToStart(string path, EncodingJob job)
+        {
+            if (!string.IsNullOrWhiteSpace(job.Options.DeviceId))
+            {
+                SessionManager.ClearTranscodingInfo(job.Options.DeviceId);
+            }
+        }
+
+        protected abstract bool IsVideoEncoder { get; }
+
+        protected virtual string GetWorkingDirectory(EncodingJobOptions options)
+        {
+            return null;
+        }
+
+        protected EncodingOptions GetEncodingOptions()
+        {
+            return ConfigurationManager.GetConfiguration<EncodingOptions>("encoding");
+        }
+
+        protected abstract string GetCommandLineArguments(EncodingJob job);
+
+        private string GetOutputFilePath(EncodingJob state)
+        {
+            var folder = string.IsNullOrWhiteSpace(state.Options.TempDirectory) ?
+                ConfigurationManager.ApplicationPaths.TranscodingTempPath :
+                state.Options.TempDirectory;
+
+            var outputFileExtension = GetOutputFileExtension(state);
+
+            var filename = state.Id + (outputFileExtension ?? string.Empty).ToLower();
+            return Path.Combine(folder, filename);
+        }
+
+        protected virtual string GetOutputFileExtension(EncodingJob state)
+        {
+            if (!string.IsNullOrWhiteSpace(state.Options.Container))
+            {
+                return "." + state.Options.Container;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the name of the output video codec
+        /// </summary>
+        /// <param name="state">The state.</param>
+        /// <returns>System.String.</returns>
+        protected string GetVideoDecoder(EncodingJob state)
+        {
+            if (string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            // Only use alternative encoders for video files.
+            // When using concat with folder rips, if the mfx session fails to initialize, ffmpeg will be stuck retrying and will not exit gracefully
+            // Since transcoding of folder rips is expiremental anyway, it's not worth adding additional variables such as this.
+            if (state.VideoType != VideoType.VideoFile)
+            {
+                return null;
+            }
+
+            if (state.VideoStream != null && !string.IsNullOrWhiteSpace(state.VideoStream.Codec))
+            {
+                if (string.Equals(GetEncodingOptions().HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
+                {
+                    switch (state.MediaSource.VideoStream.Codec.ToLower())
+                    {
+                        case "avc":
+                        case "h264":
+                            if (MediaEncoder.SupportsDecoder("h264_qsv"))
+                            {
+                                // Seeing stalls and failures with decoding. Not worth it compared to encoding.
+                                return "-c:v h264_qsv ";
+                            }
+                            break;
+                        case "mpeg2video":
+                            if (MediaEncoder.SupportsDecoder("mpeg2_qsv"))
+                            {
+                                return "-c:v mpeg2_qsv ";
+                            }
+                            break;
+                        case "vc1":
+                            if (MediaEncoder.SupportsDecoder("vc1_qsv"))
+                            {
+                                return "-c:v vc1_qsv ";
+                            }
+                            break;
+                    }
+                }
+            }
+
+            // leave blank so ffmpeg will decide
+            return null;
+        }
+
+        private async Task AcquireResources(EncodingJob state, CancellationToken cancellationToken)
+        {
+            if (state.VideoType == VideoType.Iso && state.IsoType.HasValue && IsoManager.CanMount(state.MediaPath))
+            {
+                state.IsoMount = await IsoManager.Mount(state.MediaPath, cancellationToken).ConfigureAwait(false);
+            }
+
+            if (state.MediaSource.RequiresOpening && string.IsNullOrWhiteSpace(state.Options.LiveStreamId))
+            {
+                var liveStreamResponse = await MediaSourceManager.OpenLiveStream(new LiveStreamRequest
+                {
+                    OpenToken = state.MediaSource.OpenToken
+
+                }, cancellationToken).ConfigureAwait(false);
+
+                EncodingHelper.AttachMediaSourceInfo(state, liveStreamResponse.MediaSource, null);
+
+                if (state.IsVideoRequest)
+                {
+                    EncodingHelper.TryStreamCopy(state);
+                }
+            }
+
+            if (state.MediaSource.BufferMs.HasValue)
+            {
+                await Task.Delay(state.MediaSource.BufferMs.Value, cancellationToken).ConfigureAwait(false);
+            }
+        }
+    }
+}

MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs

@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using MediaBrowser.Model.Diagnostics;
+using MediaBrowser.Model.Logging;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class EncoderValidator
+    {
+        private readonly ILogger _logger;
+        private readonly IProcessFactory _processFactory;
+
+        public EncoderValidator(ILogger logger, IProcessFactory processFactory)
+        {
+            _logger = logger;
+            _processFactory = processFactory;
+        }
+
+        public Tuple<List<string>, List<string>> Validate(string encoderPath)
+        {
+            _logger.Info("Validating media encoder at {0}", encoderPath);
+
+            var decoders = GetDecoders(encoderPath);
+            var encoders = GetEncoders(encoderPath);
+
+            _logger.Info("Encoder validation complete");
+
+            return new Tuple<List<string>, List<string>>(decoders, encoders);
+        }
+
+        public bool ValidateVersion(string encoderAppPath, bool logOutput)
+        {
+            string output = string.Empty;
+            try
+            {
+                output = GetProcessOutput(encoderAppPath, "-version");
+            }
+            catch (Exception ex)
+            {
+                if (logOutput)
+                {
+                    _logger.ErrorException("Error validating encoder", ex);
+                }
+            }
+
+            if (string.IsNullOrWhiteSpace(output))
+            {
+                return false;
+            }
+
+            _logger.Info("ffmpeg info: {0}", output);
+
+            if (output.IndexOf("Libav developers", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                return false;
+            }
+
+            output = " " + output + " ";
+
+            for (var i = 2013; i <= 2015; i++)
+            {
+                var yearString = i.ToString(CultureInfo.InvariantCulture);
+                if (output.IndexOf(" " + yearString + " ", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private List<string> GetDecoders(string encoderAppPath)
+        {
+            string output = string.Empty;
+            try
+            {
+                output = GetProcessOutput(encoderAppPath, "-decoders");
+            }
+            catch (Exception )
+            {
+                //_logger.ErrorException("Error detecting available decoders", ex);
+            }
+
+            var found = new List<string>();
+            var required = new[]
+            {
+                "mpeg2video",
+                "h264_qsv",
+                "hevc_qsv",
+                "mpeg2_qsv",
+                "vc1_qsv",
+                "h264_cuvid",
+                "hevc_cuvid",
+                "dts",
+                "ac3",
+                "aac",
+                "mp3",
+                "h264",
+                "hevc"
+            };
+
+            foreach (var codec in required)
+            {
+                var srch = " " + codec + "  ";
+
+                if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    _logger.Info("Decoder available: " + codec);
+                    found.Add(codec);
+                }
+            }
+
+            return found;
+        }
+
+        private List<string> GetEncoders(string encoderAppPath)
+        {
+            string output = null;
+            try
+            {
+                output = GetProcessOutput(encoderAppPath, "-encoders");
+            }
+            catch
+            {
+            }
+
+            var found = new List<string>();
+            var required = new[]
+            {
+                "libx264",
+                "libx265",
+                "mpeg4",
+                "msmpeg4",
+                "libvpx",
+                "libvpx-vp9",
+                "aac",
+                "libmp3lame",
+                "libopus",
+                "libvorbis",
+                "srt",
+                "h264_nvenc",
+                "hevc_nvenc",
+                "h264_qsv",
+                "hevc_qsv",
+                "h264_omx",
+                "hevc_omx",
+                "h264_vaapi",
+                "hevc_vaapi",
+                "ac3"
+            };
+
+            output = output ?? string.Empty;
+
+            var index = 0;
+
+            foreach (var codec in required)
+            {
+                var srch = " " + codec + "  ";
+
+                if (output.IndexOf(srch, StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    if (index < required.Length - 1)
+                    {
+                        _logger.Info("Encoder available: " + codec);
+                    }
+
+                    found.Add(codec);
+                }
+                index++;
+            }
+
+            return found;
+        }
+
+        private string GetProcessOutput(string path, string arguments)
+        {
+            var process = _processFactory.Create(new ProcessOptions
+            {
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                FileName = path,
+                Arguments = arguments,
+                IsHidden = true,
+                ErrorDialog = false,
+                RedirectStandardOutput = true
+            });
+
+            _logger.Info("Running {0} {1}", path, arguments);
+
+            using (process)
+            {
+                process.Start();
+
+                try
+                {
+                    return process.StandardOutput.ReadToEnd();
+                }
+                catch
+                {
+                    _logger.Info("Killing process {0} {1}", path, arguments);
+
+                    // Hate having to do this
+                    try
+                    {
+                        process.Kill();
+                    }
+                    catch (Exception ex1)
+                    {
+                        _logger.ErrorException("Error killing process", ex1);
+                    }
+
+                    throw;
+                }
+            }
+        }
+    }
+}

MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs

@@ -0,0 +1,197 @@
+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.Logging;
+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;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class EncodingJob : EncodingJobInfo, IDisposable
+    {
+        public bool HasExited { get; internal set; }
+        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; }
+        }
+
+        public string 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)
+        {
+            _logger = logger;
+            _mediaSourceManager = mediaSourceManager;
+            Id = Guid.NewGuid().ToString("N");
+
+            _logger = logger;
+            TaskCompletionSource = new TaskCompletionSource<bool>();
+        }
+
+        public override void Dispose()
+        {
+            DisposeLiveStream();
+            DisposeLogStream();
+            DisposeIsoMount();
+        }
+
+        private void DisposeLogStream()
+        {
+            if (LogFileStream != null)
+            {
+                try
+                {
+                    LogFileStream.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error disposing log stream", ex);
+                }
+
+                LogFileStream = null;
+            }
+        }
+
+        private async void DisposeLiveStream()
+        {
+            if (MediaSource.RequiresClosing && string.IsNullOrWhiteSpace(Options.LiveStreamId) && !string.IsNullOrWhiteSpace(MediaSource.LiveStreamId))
+            {
+                try
+                {
+                    await _mediaSourceManager.CloseLiveStream(MediaSource.LiveStreamId).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error closing media source", ex);
+                }
+            }
+        }
+
+        public string OutputFilePath { get; set; }
+
+        public string ActualOutputVideoCodec
+        {
+            get
+            {
+                var codec = OutputVideoCodec;
+
+                if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
+                {
+                    var stream = VideoStream;
+
+                    if (stream != null)
+                    {
+                        return stream.Codec;
+                    }
+
+                    return null;
+                }
+
+                return codec;
+            }
+        }
+
+        public string ActualOutputAudioCodec
+        {
+            get
+            {
+                var codec = OutputAudioCodec;
+
+                if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
+                {
+                    var stream = AudioStream;
+
+                    if (stream != null)
+                    {
+                        return stream.Codec;
+                    }
+
+                    return null;
+                }
+
+                return codec;
+            }
+        }
+
+        public void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate)
+        {
+            var ticks = transcodingPosition.HasValue ? transcodingPosition.Value.Ticks : (long?)null;
+
+            //    job.Framerate = framerate;
+
+            if (!percentComplete.HasValue && ticks.HasValue && RunTimeTicks.HasValue)
+            {
+                var pct = ticks.Value / RunTimeTicks.Value;
+                percentComplete = pct * 100;
+            }
+
+            if (percentComplete.HasValue)
+            {
+                Progress.Report(percentComplete.Value);
+            }
+
+            //    job.TranscodingPositionTicks = ticks;
+            //    job.BytesTranscoded = bytesTranscoded;
+
+            var deviceId = Options.DeviceId;
+
+            if (!string.IsNullOrWhiteSpace(deviceId))
+            {
+                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)
+                //    });
+            }
+        }
+    }
+}

MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs

@@ -0,0 +1,309 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.MediaInfo;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class EncodingJobFactory
+    {
+        private readonly ILogger _logger;
+        private readonly ILibraryManager _libraryManager;
+        private readonly IMediaSourceManager _mediaSourceManager;
+        private readonly IConfigurationManager _config;
+        private readonly IMediaEncoder _mediaEncoder;
+
+        protected static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+        
+        public EncodingJobFactory(ILogger logger, ILibraryManager libraryManager, IMediaSourceManager mediaSourceManager, IConfigurationManager config, IMediaEncoder mediaEncoder)
+        {
+            _logger = logger;
+            _libraryManager = libraryManager;
+            _mediaSourceManager = mediaSourceManager;
+            _config = config;
+            _mediaEncoder = mediaEncoder;
+        }
+
+        public async Task<EncodingJob> CreateJob(EncodingJobOptions options, EncodingHelper encodingHelper, bool isVideoRequest, IProgress<double> progress, CancellationToken cancellationToken)
+        {
+            var request = options;
+
+            if (string.IsNullOrEmpty(request.AudioCodec))
+            {
+                request.AudioCodec = InferAudioCodec(request.Container);
+            }
+
+            var state = new EncodingJob(_logger, _mediaSourceManager)
+            {
+                Options = options,
+                IsVideoRequest = isVideoRequest,
+                Progress = progress
+            };
+
+            if (!string.IsNullOrWhiteSpace(request.VideoCodec))
+            {
+                state.SupportedVideoCodecs = request.VideoCodec.Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToArray();
+                request.VideoCodec = state.SupportedVideoCodecs.FirstOrDefault();
+            }
+
+            if (!string.IsNullOrWhiteSpace(request.AudioCodec))
+            {
+                state.SupportedAudioCodecs = request.AudioCodec.Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToArray();
+                request.AudioCodec = state.SupportedAudioCodecs.FirstOrDefault();
+            }
+
+            if (!string.IsNullOrWhiteSpace(request.SubtitleCodec))
+            {
+                state.SupportedSubtitleCodecs = request.SubtitleCodec.Split(',').Where(i => !string.IsNullOrWhiteSpace(i)).ToArray();
+                request.SubtitleCodec = state.SupportedSubtitleCodecs.FirstOrDefault(i => _mediaEncoder.CanEncodeToSubtitleCodec(i))
+                    ?? state.SupportedSubtitleCodecs.FirstOrDefault();
+            }
+
+            var item = _libraryManager.GetItemById(request.Id);
+            state.ItemType = item.GetType().Name;
+
+            state.IsInputVideo = string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase);
+
+            // TODO
+            // var primaryImage = item.GetImageInfo(ImageType.Primary, 0) ??
+            //                    item.Parents.Select(i => i.GetImageInfo(ImageType.Primary, 0)).FirstOrDefault(i => i != null);
+
+            // if (primaryImage != null)
+            // {
+            //     state.AlbumCoverPath = primaryImage.Path;
+            // }
+
+            // TODO network path substition useful ?
+            var mediaSources = await _mediaSourceManager.GetPlayackMediaSources(item, null, true, true, cancellationToken).ConfigureAwait(false);
+
+            var mediaSource = string.IsNullOrEmpty(request.MediaSourceId)
+               ? mediaSources.First()
+               : mediaSources.First(i => string.Equals(i.Id, request.MediaSourceId));
+
+            var videoRequest = state.Options;
+
+            encodingHelper.AttachMediaSourceInfo(state, mediaSource, null);
+
+            //var container = Path.GetExtension(state.RequestedUrl);
+
+            //if (string.IsNullOrEmpty(container))
+            //{
+            //    container = request.Static ?
+            //        state.InputContainer :
+            //        (Path.GetExtension(GetOutputFilePath(state)) ?? string.Empty).TrimStart('.');
+            //}
+
+            //state.OutputContainer = (container ?? string.Empty).TrimStart('.');
+
+            state.OutputAudioBitrate = encodingHelper.GetAudioBitrateParam(state.Options, state.AudioStream);
+
+            state.OutputAudioCodec = state.Options.AudioCodec;
+
+            state.OutputAudioChannels = encodingHelper.GetNumAudioChannelsParam(state, state.AudioStream, state.OutputAudioCodec);
+
+            if (videoRequest != null)
+            {
+                state.OutputVideoCodec = state.Options.VideoCodec;
+                state.OutputVideoBitrate = encodingHelper.GetVideoBitrateParamValue(state.Options, state.VideoStream, state.OutputVideoCodec);
+
+                if (state.OutputVideoBitrate.HasValue)
+                {
+                    var resolution = ResolutionNormalizer.Normalize(
+                        state.VideoStream == null ? (int?)null : state.VideoStream.BitRate,
+                        state.VideoStream == null ? (int?)null : state.VideoStream.Width,
+                        state.VideoStream == null ? (int?)null : state.VideoStream.Height,
+                        state.OutputVideoBitrate.Value,
+                        state.VideoStream == null ? null : state.VideoStream.Codec,
+                        state.OutputVideoCodec,
+                        videoRequest.MaxWidth,
+                        videoRequest.MaxHeight);
+
+                    videoRequest.MaxWidth = resolution.MaxWidth;
+                    videoRequest.MaxHeight = resolution.MaxHeight;
+                }
+            }
+
+            ApplyDeviceProfileSettings(state);
+
+            if (videoRequest != null)
+            {
+                encodingHelper.TryStreamCopy(state);
+            }
+
+            //state.OutputFilePath = GetOutputFilePath(state);
+
+            return state;
+        }
+
+        protected EncodingOptions GetEncodingOptions()
+        {
+            return _config.GetConfiguration<EncodingOptions>("encoding");
+        }
+
+        /// <summary>
+        /// Infers the video codec.
+        /// </summary>
+        /// <param name="container">The container.</param>
+        /// <returns>System.Nullable{VideoCodecs}.</returns>
+        private static string InferVideoCodec(string container)
+        {
+            var ext = "." + (container ?? string.Empty);
+
+            if (string.Equals(ext, ".asf", StringComparison.OrdinalIgnoreCase))
+            {
+                return "wmv";
+            }
+            if (string.Equals(ext, ".webm", StringComparison.OrdinalIgnoreCase))
+            {
+                return "vpx";
+            }
+            if (string.Equals(ext, ".ogg", StringComparison.OrdinalIgnoreCase) || string.Equals(ext, ".ogv", StringComparison.OrdinalIgnoreCase))
+            {
+                return "theora";
+            }
+            if (string.Equals(ext, ".m3u8", StringComparison.OrdinalIgnoreCase) || string.Equals(ext, ".ts", StringComparison.OrdinalIgnoreCase))
+            {
+                return "h264";
+            }
+
+            return "copy";
+        }
+
+        private string InferAudioCodec(string container)
+        {
+            var ext = "." + (container ?? string.Empty);
+
+            if (string.Equals(ext, ".mp3", StringComparison.OrdinalIgnoreCase))
+            {
+                return "mp3";
+            }
+            if (string.Equals(ext, ".aac", StringComparison.OrdinalIgnoreCase))
+            {
+                return "aac";
+            }
+            if (string.Equals(ext, ".wma", StringComparison.OrdinalIgnoreCase))
+            {
+                return "wma";
+            }
+            if (string.Equals(ext, ".ogg", StringComparison.OrdinalIgnoreCase))
+            {
+                return "vorbis";
+            }
+            if (string.Equals(ext, ".oga", StringComparison.OrdinalIgnoreCase))
+            {
+                return "vorbis";
+            }
+            if (string.Equals(ext, ".ogv", StringComparison.OrdinalIgnoreCase))
+            {
+                return "vorbis";
+            }
+            if (string.Equals(ext, ".webm", StringComparison.OrdinalIgnoreCase))
+            {
+                return "vorbis";
+            }
+            if (string.Equals(ext, ".webma", StringComparison.OrdinalIgnoreCase))
+            {
+                return "vorbis";
+            }
+
+            return "copy";
+        }
+
+        /// <summary>
+        /// Determines whether the specified stream is H264.
+        /// </summary>
+        /// <param name="stream">The stream.</param>
+        /// <returns><c>true</c> if the specified stream is H264; otherwise, <c>false</c>.</returns>
+        protected bool IsH264(MediaStream stream)
+        {
+            var codec = stream.Codec ?? string.Empty;
+
+            return codec.IndexOf("264", StringComparison.OrdinalIgnoreCase) != -1 ||
+                   codec.IndexOf("avc", StringComparison.OrdinalIgnoreCase) != -1;
+        }
+
+        private static int GetVideoProfileScore(string profile)
+        {
+            var list = new List<string>
+            {
+                "Constrained Baseline",
+                "Baseline",
+                "Extended",
+                "Main",
+                "High",
+                "Progressive High",
+                "Constrained High"
+            };
+
+            return Array.FindIndex(list.ToArray(), t => string.Equals(t, profile, StringComparison.OrdinalIgnoreCase));
+        }
+
+        private void ApplyDeviceProfileSettings(EncodingJob state)
+        {
+            var profile = state.Options.DeviceProfile;
+
+            if (profile == null)
+            {
+                // Don't use settings from the default profile. 
+                // Only use a specific profile if it was requested.
+                return;
+            }
+
+            var audioCodec = state.ActualOutputAudioCodec;
+
+            var videoCodec = state.ActualOutputVideoCodec;
+            var outputContainer = state.Options.Container;
+
+            var mediaProfile = state.IsVideoRequest ?
+                profile.GetAudioMediaProfile(outputContainer, audioCodec, state.OutputAudioChannels, state.OutputAudioBitrate, state.OutputAudioSampleRate, state.OutputAudioBitDepth) :
+                profile.GetVideoMediaProfile(outputContainer,
+                audioCodec,
+                videoCodec,
+                state.OutputWidth,
+                state.OutputHeight,
+                state.TargetVideoBitDepth,
+                state.OutputVideoBitrate,
+                state.TargetVideoProfile,
+                state.TargetVideoLevel,
+                state.TargetFramerate,
+                state.TargetPacketLength,
+                state.TargetTimestamp,
+                state.IsTargetAnamorphic,
+                state.IsTargetInterlaced,
+                state.TargetRefFrames,
+                state.TargetVideoStreamCount,
+                state.TargetAudioStreamCount,
+                state.TargetVideoCodecTag,
+                state.IsTargetAVC);
+
+            if (mediaProfile != null)
+            {
+                state.MimeType = mediaProfile.MimeType;
+            }
+
+            var transcodingProfile = state.IsVideoRequest ?
+                profile.GetAudioTranscodingProfile(outputContainer, audioCodec) :
+                profile.GetVideoTranscodingProfile(outputContainer, audioCodec, videoCodec);
+
+            if (transcodingProfile != null)
+            {
+                state.EstimateContentLength = transcodingProfile.EstimateContentLength;
+                //state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
+                state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
+
+                state.Options.CopyTimestamps = transcodingProfile.CopyTimestamps;
+            }
+        }
+    }
+}

MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs

@@ -0,0 +1,70 @@
+using MediaBrowser.Model.MediaInfo;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public static class EncodingUtils
+    {
+        public static string GetInputArgument(List<string> inputFiles, MediaProtocol protocol)
+        {
+            if (protocol != MediaProtocol.File)
+            {
+                var url = inputFiles.First();
+
+                return string.Format("\"{0}\"", url);
+            }
+
+            return GetConcatInputArgument(inputFiles);
+        }
+
+        /// <summary>
+        /// Gets the concat input argument.
+        /// </summary>
+        /// <param name="inputFiles">The input files.</param>
+        /// <returns>System.String.</returns>
+        private static string GetConcatInputArgument(IReadOnlyList<string> inputFiles)
+        {
+            // Get all streams
+            // If there's more than one we'll need to use the concat command
+            if (inputFiles.Count > 1)
+            {
+                var files = string.Join("|", inputFiles.Select(NormalizePath).ToArray());
+
+                return string.Format("concat:\"{0}\"", files);
+            }
+
+            // Determine the input path for video files
+            return GetFileInputArgument(inputFiles[0]);
+        }
+
+        /// <summary>
+        /// Gets the file input argument.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>System.String.</returns>
+        private static string GetFileInputArgument(string path)
+        {
+            if (path.IndexOf("://") != -1)
+            {
+                return string.Format("\"{0}\"", path);
+            }
+
+            // Quotes are valid path characters in linux and they need to be escaped here with a leading \
+            path = NormalizePath(path);
+
+            return string.Format("file:\"{0}\"", path);
+        }
+
+        /// <summary>
+        /// Normalizes the path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>System.String.</returns>
+        private static string NormalizePath(string path)
+        {
+            // Quotes are valid path characters in linux and they need to be escaped here with a leading \
+            return path.Replace("\"", "\\\"");
+        }
+    }
+}

MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs

@@ -0,0 +1,182 @@
+using System;
+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 MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class FontConfigLoader
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly IApplicationPaths _appPaths;
+        private readonly ILogger _logger;
+        private readonly IZipClient _zipClient;
+        private readonly IFileSystem _fileSystem;
+
+        private readonly string[] _fontUrls =
+        {
+            "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/ARIALUNI.7z"
+        };
+
+        public FontConfigLoader(IHttpClient httpClient, IApplicationPaths appPaths, ILogger logger, IZipClient zipClient, IFileSystem fileSystem)
+        {
+            _httpClient = httpClient;
+            _appPaths = appPaths;
+            _logger = logger;
+            _zipClient = zipClient;
+            _fileSystem = fileSystem;
+        }
+
+        /// <summary>
+        /// Extracts the fonts.
+        /// </summary>
+        /// <param name="targetPath">The target path.</param>
+        /// <returns>Task.</returns>
+        public async Task DownloadFonts(string targetPath)
+        {
+            try
+            {
+                var fontsDirectory = Path.Combine(targetPath, "fonts");
+
+                _fileSystem.CreateDirectory(fontsDirectory);
+
+                const string fontFilename = "ARIALUNI.TTF";
+
+                var fontFile = Path.Combine(fontsDirectory, fontFilename);
+
+                if (_fileSystem.FileExists(fontFile))
+                {
+                    await WriteFontConfigFile(fontsDirectory).ConfigureAwait(false);
+                }
+                else
+                {
+                    // Kick this off, but no need to wait on it
+                    var task = Task.Run(async () =>
+                    {
+                        await DownloadFontFile(fontsDirectory, fontFilename, new SimpleProgress<double>()).ConfigureAwait(false);
+
+                        await WriteFontConfigFile(fontsDirectory).ConfigureAwait(false);
+                    });
+                }
+            }
+            catch (HttpException ex)
+            {
+                // Don't let the server crash because of this
+                _logger.ErrorException("Error downloading ffmpeg font files", ex);
+            }
+            catch (Exception ex)
+            {
+                // Don't let the server crash because of this
+                _logger.ErrorException("Error writing ffmpeg font files", ex);
+            }
+        }
+
+        /// <summary>
+        /// Downloads the font file.
+        /// </summary>
+        /// <param name="fontsDirectory">The fonts directory.</param>
+        /// <param name="fontFilename">The font filename.</param>
+        /// <returns>Task.</returns>
+        private async Task DownloadFontFile(string fontsDirectory, string fontFilename, IProgress<double> progress)
+        {
+            var existingFile = _fileSystem
+                .GetFilePaths(_appPaths.ProgramDataPath, true)
+                .FirstOrDefault(i => string.Equals(fontFilename, Path.GetFileName(i), StringComparison.OrdinalIgnoreCase));
+
+            if (existingFile != null)
+            {
+                try
+                {
+                    _fileSystem.CopyFile(existingFile, Path.Combine(fontsDirectory, fontFilename), true);
+                    return;
+                }
+                catch (IOException ex)
+                {
+                    // Log this, but don't let it fail the operation
+                    _logger.ErrorException("Error copying file", ex);
+                }
+            }
+
+            string tempFile = null;
+
+            foreach (var url in _fontUrls)
+            {
+                progress.Report(0);
+
+                try
+                {
+                    tempFile = await _httpClient.GetTempFile(new HttpRequestOptions
+                    {
+                        Url = url,
+                        Progress = progress
+
+                    }).ConfigureAwait(false);
+
+                    break;
+                }
+                catch (Exception ex)
+                {
+                    // The core can function without the font file, so handle this
+                    _logger.ErrorException("Failed to download ffmpeg font file from {0}", ex, url);
+                }
+            }
+
+            if (string.IsNullOrEmpty(tempFile))
+            {
+                return;
+            }
+
+            Extract7zArchive(tempFile, fontsDirectory);
+
+            try
+            {
+                _fileSystem.DeleteFile(tempFile);
+            }
+            catch (IOException ex)
+            {
+                // Log this, but don't let it fail the operation
+                _logger.ErrorException("Error deleting temp file {0}", ex, tempFile);
+            }
+        }
+        private void Extract7zArchive(string archivePath, string targetPath)
+        {
+            _logger.Info("Extracting {0} to {1}", archivePath, targetPath);
+
+            _zipClient.ExtractAllFrom7z(archivePath, targetPath, true);
+        }
+
+        /// <summary>
+        /// Writes the font config file.
+        /// </summary>
+        /// <param name="fontsDirectory">The fonts directory.</param>
+        /// <returns>Task.</returns>
+        private async Task WriteFontConfigFile(string fontsDirectory)
+        {
+            const string fontConfigFilename = "fonts.conf";
+            var fontConfigFile = Path.Combine(fontsDirectory, fontConfigFilename);
+
+            if (!_fileSystem.FileExists(fontConfigFile))
+            {
+                var contents = string.Format("<?xml version=\"1.0\"?><fontconfig><dir>{0}</dir><alias><family>Arial</family><prefer>Arial Unicode MS</prefer></alias></fontconfig>", fontsDirectory);
+
+                var bytes = Encoding.UTF8.GetBytes(contents);
+
+                using (var fileStream = _fileSystem.GetFileStream(fontConfigFile, FileOpenMode.Create, FileAccessMode.Write,
+                                                    FileShareMode.Read, true))
+                {
+                    await fileStream.WriteAsync(bytes, 0, bytes.Length);
+                }
+            }
+        }
+    }
+}

MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs

@@ -0,0 +1,66 @@
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using MediaBrowser.Model.Diagnostics;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class VideoEncoder : BaseEncoder
+    {
+        public VideoEncoder(MediaEncoder mediaEncoder, ILogger logger, IServerConfigurationManager configurationManager, IFileSystem fileSystem, IIsoManager isoManager, ILibraryManager libraryManager, ISessionManager sessionManager, ISubtitleEncoder subtitleEncoder, IMediaSourceManager mediaSourceManager, IProcessFactory processFactory) : base(mediaEncoder, logger, configurationManager, fileSystem, isoManager, libraryManager, sessionManager, subtitleEncoder, mediaSourceManager, processFactory)
+        {
+        }
+
+        protected override string GetCommandLineArguments(EncodingJob state)
+        {
+            // Get the output codec name
+            var encodingOptions = GetEncodingOptions();
+
+            return EncodingHelper.GetProgressiveVideoFullCommandLine(state, encodingOptions, state.OutputFilePath, "superfast");
+        }
+
+        protected override string GetOutputFileExtension(EncodingJob state)
+        {
+            var ext = base.GetOutputFileExtension(state);
+
+            if (!string.IsNullOrEmpty(ext))
+            {
+                return ext;
+            }
+
+            var videoCodec = state.Options.VideoCodec;
+
+            if (string.Equals(videoCodec, "h264", StringComparison.OrdinalIgnoreCase))
+            {
+                return ".ts";
+            }
+            if (string.Equals(videoCodec, "theora", StringComparison.OrdinalIgnoreCase))
+            {
+                return ".ogv";
+            }
+            if (string.Equals(videoCodec, "vpx", StringComparison.OrdinalIgnoreCase))
+            {
+                return ".webm";
+            }
+            if (string.Equals(videoCodec, "wmv", StringComparison.OrdinalIgnoreCase))
+            {
+                return ".asf";
+            }
+
+            return null;
+        }
+
+        protected override bool IsVideoEncoder
+        {
+            get { return true; }
+        }
+
+    }
+}