unify audio conversion

1 files changed, 1 insertions, 60 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
index 05b3ca5fc..566e7946d 100644
--- a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
@@ -5,8 +5,6 @@ using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Diagnostics;
 
 namespace MediaBrowser.MediaEncoding.Encoder
@@ -19,66 +17,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         protected override string GetCommandLineArguments(EncodingJob state)
         {
-            var audioTranscodeParams = new List<string>();
-
-            var bitrate = state.OutputAudioBitrate;
-
-            if (bitrate.HasValue)
-            {
-                audioTranscodeParams.Add("-ab " + bitrate.Value.ToString(UsCulture));
-            }
-
-            if (state.OutputAudioChannels.HasValue)
-            {
-                audioTranscodeParams.Add("-ac " + state.OutputAudioChannels.Value.ToString(UsCulture));
-            }
-
-            // opus will fail on 44100
-            if (!string.Equals(state.OutputAudioCodec, "opus", StringComparison.OrdinalIgnoreCase))
-            {
-                if (state.OutputAudioSampleRate.HasValue)
-                {
-                    audioTranscodeParams.Add("-ar " + state.OutputAudioSampleRate.Value.ToString(UsCulture));
-                }
-            }
-
             var encodingOptions = GetEncodingOptions();
 
-            var threads = EncodingHelper.GetNumberOfThreads(state, encodingOptions, false);
-
-            var inputModifier = EncodingHelper.GetInputModifier(state, encodingOptions);
-
-            var albumCoverInput = string.Empty;
-            var mapArgs = string.Empty;
-            var metadata = string.Empty;
-            var vn = string.Empty;
-
-            var hasArt = !string.IsNullOrWhiteSpace(state.AlbumCoverPath);
-            hasArt = false;
-
-            if (hasArt)
-            {
-                albumCoverInput = " -i \"" + state.AlbumCoverPath + "\"";
-                mapArgs = " -map 0:a -map 1:v -c:v copy";
-                metadata = " -metadata:s:v title=\"Album cover\" -metadata:s:v comment=\"Cover(Front)\"";
-            }
-            else
-            {
-                vn = " -vn";
-            }
-
-            var result = string.Format("{0} {1}{6}{7} -threads {2}{3} {4} -id3v2_version 3 -write_id3v1 1{8} -y \"{5}\"",
-                inputModifier,
-                EncodingHelper.GetInputArgument(state, GetEncodingOptions()),
-                threads,
-                vn,
-                string.Join(" ", audioTranscodeParams.ToArray()),
-                state.OutputFilePath,
-                albumCoverInput,
-                mapArgs,
-                metadata).Trim();
-
-            return result;
+            return EncodingHelper.GetProgressiveAudioFullCommandLine(state, encodingOptions, state.OutputFilePath);
         }
 
         protected override string GetOutputFileExtension(EncodingJob state)