From 6fef12dd08cd839199c919dd57470a950d4c20dc Mon Sep 17 00:00:00 2001 From: N00MKRAD Date: Wed, 3 Mar 2021 22:27:43 +0100 Subject: [PATCH] Added Settings UI option for audio/sub muxing mode --- Code/Forms/SettingsForm.Designer.cs | 57 ++++++++++++++++++++++------- Code/Forms/SettingsForm.cs | 2 + Code/IO/Config.cs | 2 +- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/Code/Forms/SettingsForm.Designer.cs b/Code/Forms/SettingsForm.Designer.cs index 063d12a..f6e0b29 100644 --- a/Code/Forms/SettingsForm.Designer.cs +++ b/Code/Forms/SettingsForm.Designer.cs @@ -173,6 +173,8 @@ this.label68 = new System.Windows.Forms.Label(); this.label69 = new System.Windows.Forms.Label(); this.exportNamePatternLoop = new System.Windows.Forms.TextBox(); + this.label70 = new System.Windows.Forms.Label(); + this.audioSubTransferMode = new System.Windows.Forms.ComboBox(); this.settingsTabList.SuspendLayout(); this.generalTab.SuspendLayout(); this.tabListPage2.SuspendLayout(); @@ -1640,6 +1642,8 @@ // debugTab // this.debugTab.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48))))); + this.debugTab.Controls.Add(this.audioSubTransferMode); + this.debugTab.Controls.Add(this.label70); this.debugTab.Controls.Add(this.panel13); this.debugTab.Controls.Add(this.modelsBaseUrl); this.debugTab.Controls.Add(this.label42); @@ -1706,16 +1710,16 @@ // this.ffEncArgs.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.ffEncArgs.ForeColor = System.Drawing.Color.White; - this.ffEncArgs.Location = new System.Drawing.Point(280, 240); + this.ffEncArgs.Location = new System.Drawing.Point(280, 270); this.ffEncArgs.MinimumSize = new System.Drawing.Size(4, 21); this.ffEncArgs.Name = "ffEncArgs"; - this.ffEncArgs.Size = new System.Drawing.Size(250, 20); + this.ffEncArgs.Size = new System.Drawing.Size(250, 21); this.ffEncArgs.TabIndex = 85; // // label56 // this.label56.AutoSize = true; - this.label56.Location = new System.Drawing.Point(10, 243); + this.label56.Location = new System.Drawing.Point(10, 273); this.label56.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7); this.label56.Name = "label56"; this.label56.Size = new System.Drawing.Size(154, 13); @@ -1737,7 +1741,7 @@ // this.label54.AutoSize = true; this.label54.ForeColor = System.Drawing.Color.Silver; - this.label54.Location = new System.Drawing.Point(543, 214); + this.label54.Location = new System.Drawing.Point(543, 244); this.label54.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7); this.label54.Name = "label54"; this.label54.Size = new System.Drawing.Size(118, 13); @@ -1759,7 +1763,7 @@ "slow", "slower", "veryslow"}); - this.ffEncPreset.Location = new System.Drawing.Point(280, 210); + this.ffEncPreset.Location = new System.Drawing.Point(280, 240); this.ffEncPreset.Name = "ffEncPreset"; this.ffEncPreset.Size = new System.Drawing.Size(250, 21); this.ffEncPreset.TabIndex = 78; @@ -1767,7 +1771,7 @@ // label47 // this.label47.AutoSize = true; - this.label47.Location = new System.Drawing.Point(10, 213); + this.label47.Location = new System.Drawing.Point(10, 243); this.label47.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7); this.label47.Name = "label47"; this.label47.Size = new System.Drawing.Size(145, 13); @@ -1800,7 +1804,7 @@ // this.label41.AutoSize = true; this.label41.ForeColor = System.Drawing.Color.Silver; - this.label41.Location = new System.Drawing.Point(308, 273); + this.label41.Location = new System.Drawing.Point(308, 303); this.label41.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7); this.label41.Name = "label41"; this.label41.Size = new System.Drawing.Size(395, 13); @@ -1811,7 +1815,7 @@ // ffprobeCountFrames // this.ffprobeCountFrames.AutoSize = true; - this.ffprobeCountFrames.Location = new System.Drawing.Point(280, 273); + this.ffprobeCountFrames.Location = new System.Drawing.Point(280, 303); this.ffprobeCountFrames.Name = "ffprobeCountFrames"; this.ffprobeCountFrames.Size = new System.Drawing.Size(15, 14); this.ffprobeCountFrames.TabIndex = 73; @@ -1820,7 +1824,7 @@ // label40 // this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(10, 273); + this.label40.Location = new System.Drawing.Point(10, 303); this.label40.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7); this.label40.Name = "label40"; this.label40.Size = new System.Drawing.Size(162, 13); @@ -1831,7 +1835,7 @@ // this.label38.AutoSize = true; this.label38.ForeColor = System.Drawing.Color.Silver; - this.label38.Location = new System.Drawing.Point(543, 186); + this.label38.Location = new System.Drawing.Point(543, 216); this.label38.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7); this.label38.Name = "label38"; this.label38.Size = new System.Drawing.Size(131, 13); @@ -1842,16 +1846,16 @@ // this.ffEncThreads.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.ffEncThreads.ForeColor = System.Drawing.Color.White; - this.ffEncThreads.Location = new System.Drawing.Point(280, 183); + this.ffEncThreads.Location = new System.Drawing.Point(280, 210); this.ffEncThreads.MinimumSize = new System.Drawing.Size(4, 21); this.ffEncThreads.Name = "ffEncThreads"; - this.ffEncThreads.Size = new System.Drawing.Size(250, 20); + this.ffEncThreads.Size = new System.Drawing.Size(250, 21); this.ffEncThreads.TabIndex = 70; // // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(10, 183); + this.label37.Location = new System.Drawing.Point(10, 213); this.label37.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(204, 13); @@ -1996,6 +2000,31 @@ this.exportNamePatternLoop.Size = new System.Drawing.Size(125, 21); this.exportNamePatternLoop.TabIndex = 85; // + // label70 + // + this.label70.AutoSize = true; + this.label70.Location = new System.Drawing.Point(10, 182); + this.label70.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7); + this.label70.Name = "label70"; + this.label70.Size = new System.Drawing.Size(165, 13); + this.label70.TabIndex = 88; + this.label70.Text = "Audio And Subtitle Merging Mode"; + // + // audioSubTransferMode + // + this.audioSubTransferMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.audioSubTransferMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.audioSubTransferMode.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.audioSubTransferMode.ForeColor = System.Drawing.Color.White; + this.audioSubTransferMode.FormattingEnabled = true; + this.audioSubTransferMode.Items.AddRange(new object[] { + "Copy Streams Directly From Input Video", + "Extract, Interpolate, Then Merge (Works even if input video was deleted)"}); + this.audioSubTransferMode.Location = new System.Drawing.Point(280, 179); + this.audioSubTransferMode.Name = "audioSubTransferMode"; + this.audioSubTransferMode.Size = new System.Drawing.Size(400, 21); + this.audioSubTransferMode.TabIndex = 89; + // // SettingsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2180,5 +2209,7 @@ private System.Windows.Forms.TextBox exportNamePatternLoop; private System.Windows.Forms.Label label69; private System.Windows.Forms.Label label68; + private System.Windows.Forms.Label label70; + private System.Windows.Forms.ComboBox audioSubTransferMode; } } \ No newline at end of file diff --git a/Code/Forms/SettingsForm.cs b/Code/Forms/SettingsForm.cs index b2045be..717648f 100644 --- a/Code/Forms/SettingsForm.cs +++ b/Code/Forms/SettingsForm.cs @@ -106,6 +106,7 @@ namespace Flowframes.Forms ConfigParser.SaveComboxIndex(cmdDebugMode); ConfigParser.SaveGuiElement(autoDedupFrames); ConfigParser.SaveGuiElement(modelsBaseUrl); + ConfigParser.SaveComboxIndex(audioSubTransferMode); ConfigParser.SaveGuiElement(ffEncThreads, ConfigParser.StringMode.Int); ConfigParser.SaveGuiElement(ffEncPreset); ConfigParser.SaveGuiElement(ffEncArgs); @@ -160,6 +161,7 @@ namespace Flowframes.Forms ConfigParser.LoadComboxIndex(cmdDebugMode); ConfigParser.LoadGuiElement(autoDedupFrames); ConfigParser.LoadGuiElement(modelsBaseUrl); + ConfigParser.LoadComboxIndex(audioSubTransferMode); ConfigParser.LoadGuiElement(ffEncThreads); ConfigParser.LoadGuiElement(ffEncPreset); ConfigParser.LoadGuiElement(ffEncArgs); diff --git a/Code/IO/Config.cs b/Code/IO/Config.cs index c9b1c04..48e985c 100644 --- a/Code/IO/Config.cs +++ b/Code/IO/Config.cs @@ -159,7 +159,7 @@ namespace Flowframes.IO if (key == "gifColors") return WriteDefault(key, "128 (High)"); if (key == "minVidLength") return WriteDefault(key, "2"); // AI - if (key == "uhdThresh") return WriteDefault(key, "1440"); + if (key == "uhdThresh") return WriteDefault(key, "1600"); if (key == "rifeCudaFp16") return WriteDefault(key, NvApi.HasTensorCores().ToString()); if (key == "ncnnThreads") return WriteDefault(key, "1"); if (key == "dainNcnnTilesize") return WriteDefault(key, "768");