Easier UI and explicit commandline args for picking video and audio c…

…odecs for ffmpeg
maxim-zhao · Jun 30, 2024 · 7228b8b · 7228b8b
1 parent 90a9a37
commit 7228b8b
Show file tree

Hide file tree

Showing 5 changed files with 284 additions and 217 deletions.
diff --git a/LibSidWiz/Outputs/FfmpegOutput.cs b/LibSidWiz/Outputs/FfmpegOutput.cs
@@ -11,19 +11,25 @@ public class FfmpegOutput : IGraphicsOutput
         private readonly Process _process;
         private readonly BinaryWriter _writer;
 
-        public FfmpegOutput(string pathToExe, string filename, int width, int height, int fps, string extraArgs, string masterAudioFilename)
+        public FfmpegOutput(string pathToExe, string filename, int width, int height, int fps, string extraArgs, string masterAudioFilename, string videoCodec, string audioCodec)
         {
             // Build the FFMPEG commandline
             var arguments = "-y -hide_banner"; // Overwrite, don't show banner at startup
 
-            // Audio part
+            // Audio input
             if (File.Exists(masterAudioFilename))
             {
                 arguments += $" -i \"{masterAudioFilename}\"";
             }
 
-            // Video part
-            arguments += $" -f rawvideo -pixel_format bgr0 -video_size {width}x{height} -framerate {fps} -i pipe: -movflags +faststart";
+            // Video input
+            arguments += $" -f rawvideo -pixel_format bgr0 -video_size {width}x{height} -framerate {fps} -i pipe:";
+
+            // Audio output
+            arguments += $" -codec:a {audioCodec}";
+
+            // Video output
+            arguments += $" -codec:v {videoCodec} -movflags +faststart";
 
             // Extra args
             arguments += $" {extraArgs} \"{filename}\"";

diff --git a/SidWiz/SidWizPlusGUI.Designer.cs b/SidWiz/SidWizPlusGUI.Designer.cs
diff --git a/SidWiz/SidWizPlusGUI.cs b/SidWiz/SidWizPlusGUI.cs
@@ -95,7 +95,7 @@ private class Settings
             public Color BackgroundColor { get; set; } = Color.Black;
             public string BackgroundImageFilename { get; set; }
             public PreviewSettings Preview { get; } = new() {Enabled = true, Frameskip = 1};
-            public EncodeSettings EncodeVideo { get; } = new() {Enabled = false};
+            public EncodeSettings EncodeVideo { get; } = new() {Enabled = false, VideoCodec = "h264", AudioCodec = "aac"};
             public int RenderThreads { get; set; } = Environment.ProcessorCount;
 
             public MasterAudioSettings MasterAudio { get; } = new() {IsAutomatic = true, ApplyReplayGain = true};
@@ -110,6 +110,8 @@ public class MasterAudioSettings
             public class EncodeSettings
             {
                 public bool Enabled { get; set; }
+                public string VideoCodec { get; set; }
+                public string AudioCodec { get; set; }
             }
 
             public class PreviewSettings
@@ -138,6 +140,8 @@ public void FromControls(SidWizPlusGui form)
                 Preview.Enabled = form.PreviewCheckBox.Checked;
                 Preview.Frameskip = (int) form.PreviewFrameskip.Value;
                 EncodeVideo.Enabled = form.EncodeCheckBox.Checked;
+                EncodeVideo.VideoCodec = form.VideoCodec.Text;
+                EncodeVideo.AudioCodec = form.AudioCodec.Text;
                 MasterAudio.IsAutomatic = form.AutogenerateMasterMix.Checked;
                 MasterAudio.ApplyReplayGain = form.MasterMixReplayGain.Checked;
                 MasterAudio.Path = form.MasterAudioPath.Text;
@@ -161,6 +165,8 @@ public void ToControls(SidWizPlusGui form)
                 form.PreviewCheckBox.Checked = Preview.Enabled;
                 form.PreviewFrameskip.Value = Preview.Frameskip;
                 form.EncodeCheckBox.Checked = EncodeVideo.Enabled;
+                form.VideoCodec.Text = EncodeVideo.VideoCodec;
+                form.AudioCodec.Text = EncodeVideo.AudioCodec;
                 form.AutogenerateMasterMix.Checked = MasterAudio.IsAutomatic;
                 form.MasterMixReplayGain.Checked = MasterAudio.ApplyReplayGain;
                 form.MasterAudioPath.Text = MasterAudio.Path;
@@ -809,7 +815,9 @@ private void RenderButton_Click(object sender, EventArgs e)
                         _settings.Height,
                         _settings.FrameRate,
                         _programSettings.FfmpegExtraParameters,
-                        _settings.MasterAudio.Path));
+                        _settings.MasterAudio.Path,
+                        _settings.EncodeVideo.VideoCodec,
+                        _settings.EncodeVideo.AudioCodec));
                 }
             }