unify encodng param creation

1 files changed, 2 insertions, 90 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
index a779c1bca..96c126923 100644
--- a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
@@ -18,100 +18,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
         }
 
-        protected override async Task<string> GetCommandLineArguments(EncodingJob state)
+        protected override string GetCommandLineArguments(EncodingJob state)
         {
             // Get the output codec name
             var encodingOptions = GetEncodingOptions();
-            var videoCodec = EncodingHelper.GetVideoEncoder(state, encodingOptions);
 
-            var format = string.Empty;
-            var keyFrame = string.Empty;
-
-            if (string.Equals(Path.GetExtension(state.OutputFilePath), ".mp4", StringComparison.OrdinalIgnoreCase) &&
-                state.Options.Context == EncodingContext.Streaming)
-            {
-                // Comparison: https://github.com/jansmolders86/mediacenterjs/blob/master/lib/transcoding/desktop.js
-                format = " -f mp4 -movflags frag_keyframe+empty_moov";
-            }
-
-            var threads = EncodingHelper.GetNumberOfThreads(state, encodingOptions, string.Equals(videoCodec, "libvpx", StringComparison.OrdinalIgnoreCase));
-
-            var inputModifier = EncodingHelper.GetInputModifier(state, encodingOptions);
-
-            var videoArguments = await GetVideoArguments(state, videoCodec).ConfigureAwait(false);
-
-            return string.Format("{0} {1}{2} {3} {4} -map_metadata -1 -threads {5} {6}{7} -y \"{8}\"",
-                inputModifier,
-                EncodingHelper.GetInputArgument(state, encodingOptions),
-                keyFrame,
-                EncodingHelper.GetMapArgs(state),
-                videoArguments,
-                threads,
-                EncodingHelper.GetProgressiveVideoAudioArguments(state, encodingOptions),
-                format,
-                state.OutputFilePath
-                ).Trim();
-        }
-
-        /// <summary>
-        /// Gets video arguments to pass to ffmpeg
-        /// </summary>
-        /// <param name="state">The state.</param>
-        /// <param name="videoCodec">The video codec.</param>
-        /// <returns>System.String.</returns>
-        private async Task<string> GetVideoArguments(EncodingJob state, string videoCodec)
-        {
-            var args = "-codec:v:0 " + videoCodec;
-
-            if (state.EnableMpegtsM2TsMode)
-            {
-                args += " -mpegts_m2ts_mode 1";
-            }
-
-            var isOutputMkv = string.Equals(state.Options.OutputContainer, "mkv", StringComparison.OrdinalIgnoreCase);
-
-            if (state.RunTimeTicks.HasValue)
-            {
-                //args += " -copyts -avoid_negative_ts disabled -start_at_zero";
-            }
-
-            if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase))
-            {
-                if (state.VideoStream != null && EncodingHelper.IsH264(state.VideoStream) && string.Equals(state.Options.OutputContainer, "ts", StringComparison.OrdinalIgnoreCase) && !string.Equals(state.VideoStream.NalLengthSize, "0", StringComparison.OrdinalIgnoreCase))
-                {
-                    args += " -bsf:v h264_mp4toannexb";
-                }
-
-                return args;
-            }
-
-            var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"",
-                5.ToString(UsCulture));
-
-            args += keyFrameArg;
-
-            var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream && state.Options.SubtitleMethod == SubtitleDeliveryMethod.Encode;
-
-            // Add resolution params, if specified
-            if (!hasGraphicalSubs)
-            {
-                args += EncodingHelper.GetOutputSizeParam(state, videoCodec);
-            }
-
-            var qualityParam = EncodingHelper.GetVideoQualityParam(state, videoCodec, GetEncodingOptions(), "superfast");
-
-            if (!string.IsNullOrEmpty(qualityParam))
-            {
-                args += " " + qualityParam.Trim();
-            }
-
-            // This is for internal graphical subs
-            if (hasGraphicalSubs)
-            {
-                args += EncodingHelper.GetGraphicalSubtitleParam(state, videoCodec);
-            }
-
-            return args;
+            return EncodingHelper.GetProgressiveVideoFullCommandLine(state, encodingOptions, state.OutputFilePath, "superfast");
         }
 
         protected override string GetOutputFileExtension(EncodingJob state)