From 59ac045c6b875fd9ed8dc2ecc2ca580ba4fdab2d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 19 Mar 2017 02:10:11 -0400
Subject: increase unification of param building

---
 MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs | 45 +---------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
index 52ef4d834..a779c1bca 100644
--- a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 EncodingHelper.GetMapArgs(state),
                 videoArguments,
                 threads,
-                GetAudioArguments(state),
+                EncodingHelper.GetProgressiveVideoAudioArguments(state, encodingOptions),
                 format,
                 state.OutputFilePath
                 ).Trim();
@@ -114,49 +114,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return args;
         }
 
-        /// <summary>
-        /// Gets audio arguments to pass to ffmpeg
-        /// </summary>
-        /// <param name="state">The state.</param>
-        /// <returns>System.String.</returns>
-        private string GetAudioArguments(EncodingJob state)
-        {
-            // If the video doesn't have an audio stream, return a default.
-            if (state.AudioStream == null && state.VideoStream != null)
-            {
-                return string.Empty;
-            }
-
-            // Get the output codec name
-            var codec = EncodingHelper.GetAudioEncoder(state);
-
-            var args = "-codec:a:0 " + codec;
-
-            if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
-            {
-                return args;
-            }
-
-            // Add the number of audio channels
-            var channels = state.OutputAudioChannels;
-
-            if (channels.HasValue)
-            {
-                args += " -ac " + channels.Value;
-            }
-
-            var bitrate = state.OutputAudioBitrate;
-
-            if (bitrate.HasValue)
-            {
-                args += " -ab " + bitrate.Value.ToString(UsCulture);
-            }
-
-            args += " " + EncodingHelper.GetAudioFilterParam(state, GetEncodingOptions(), false);
-
-            return args;
-        }
-
         protected override string GetOutputFileExtension(EncodingJob state)
         {
             var ext = base.GetOutputFileExtension(state);
-- 
cgit v1.2.3