Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2025-12-16 08:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed obsolete encoding settings, fixed VS frame extension

Browse Source
This commit is contained in:
n00mkrad
2023-02-15 18:25:41 +01:00
parent 4fce4a566b
commit 46d3edb4e4
10 changed files with 22 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Code/Form1.Designer.cs generated
View File

@@ -1859,19 +1859,14 @@
private HTAlt.WinForms.HTButton paypalBtn;
private HTAlt.WinForms.HTButton patreonBtn;
private HTAlt.WinForms.HTButton settingsBtn;
private System.Windows.Forms.TabPage interpOptsTab;
private System.Windows.Forms.TabPage quickSettingsTab;
private System.Windows.Forms.TabPage abtTab;
private HTAlt.WinForms.HTButton browseOutBtn;
private HTAlt.WinForms.HTButton browseInputFileBtn;
private HTAlt.WinForms.HTButton browseInputBtn;
private System.Windows.Forms.TabPage previewTab;
private System.Windows.Forms.PictureBox previewPicturebox;
public HTAlt.WinForms.HTTabControl mainTabControl;
private HTAlt.WinForms.HTButton queueBtn;
private HTAlt.WinForms.HTButton htButton1;
private HTAlt.WinForms.HTButton updateBtn;
private System.Windows.Forms.TabPage welcomeTab;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Panel panel6;
private System.Windows.Forms.Label label15;
@@ -1933,6 +1928,11 @@
private System.Windows.Forms.ContextMenuStrip menuStripQueue;
private System.Windows.Forms.ToolStripMenuItem addCurrentConfigurationToQueueToolStripMenuItem;
private System.Windows.Forms.TextBox textboxOutputQualityCust;
public System.Windows.Forms.TabPage interpOptsTab;
public System.Windows.Forms.TabPage quickSettingsTab;
public System.Windows.Forms.TabPage abtTab;
public System.Windows.Forms.TabPage previewTab;
public System.Windows.Forms.TabPage welcomeTab;
}
}

19
Code/Form1.cs
View File

@@ -199,19 +199,14 @@ namespace Flowframes
public void SetTab(string tabName)
{
foreach (TabPage tab in mainTabControl.TabPages)
{
if (tab.Text.ToLowerInvariant() == tabName.ToLowerInvariant())
mainTabControl.SelectedTab = tab;
}
mainTabControl.SelectedTab = mainTabControl.TabPages.Cast<TabPage>().Where(p => p.Name == tabName).FirstOrDefault();
mainTabControl.Refresh();
mainTabControl.Update();
}
public InterpSettings GetCurrentSettings()
{
SetTab("interpolate");
SetTab(interpOptsTab.Name);
string inPath = inputTbox.Text.Trim();
string outPath = outputTbox.Text.Trim();
AI ai = GetAi();
@@ -222,7 +217,7 @@ namespace Flowframes
public InterpSettings UpdateCurrentSettings(InterpSettings settings)
{
SetTab("interpolate");
SetTab(interpOptsTab.Name);
string inPath = inputTbox.Text.Trim();
if (settings.inPath != inPath) // If path changed, get new instance
@@ -594,7 +589,7 @@ namespace Flowframes
}
else
{
SetTab("interpolation");
SetTab(interpOptsTab.Name);
Logger.Log("Selected video/directory: " + Path.GetFileName(files[0]), true);
inputTbox.Text = files[0];
@@ -616,7 +611,7 @@ namespace Flowframes
if (dialog == DialogResult.Yes)
{
SetTab("interpolation");
SetTab(interpOptsTab.Name);
Interpolate.Cancel();
}
}
@@ -673,7 +668,7 @@ namespace Flowframes
private void welcomeLabel2_Click(object sender, EventArgs e)
{
SetTab("interpolation");
SetTab(interpOptsTab.Name);
}
public void UpdateStepByStepControls()
@@ -688,7 +683,7 @@ namespace Flowframes
private async void runStepBtn_Click(object sender, EventArgs e)
{
ValidateFactor();
SetTab("interpolate");
SetTab(interpOptsTab.Name);
await InterpolateSteps.Run(stepSelector.Text);
}

2
Code/Forms/BatchForm.cs
View File

@@ -160,7 +160,7 @@ namespace Flowframes.Forms
current.inFps = current.inFpsDetected;
if(current.inFps.GetFloat() <= 0)
current.inFps = InterpolateUtils.AskForFramerate(Name, false);
current.inFps = InterpolateUtils.AskForFramerate(new DirectoryInfo(path).Name, false);
current.outFps = current.inFps * current.interpFactor;

392
Code/Forms/SettingsForm.Designer.cs generated
View File

@@ -142,29 +142,6 @@
this.label21 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.tabListPage1 = new Cyotek.Windows.Forms.TabListPage();
this.imgSeqQuality = new System.Windows.Forms.ComboBox();
this.pixFmt = new System.Windows.Forms.ComboBox();
this.label75 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.vp9Crf = new System.Windows.Forms.NumericUpDown();
this.mp4Crf = new System.Windows.Forms.NumericUpDown();
this.imgSeqFormat = new System.Windows.Forms.ComboBox();
this.label40 = new System.Windows.Forms.Label();
this.gifDitherType = new System.Windows.Forms.ComboBox();
this.aviColors = new System.Windows.Forms.ComboBox();
this.aviCodec = new System.Windows.Forms.ComboBox();
this.label60 = new System.Windows.Forms.Label();
this.proResProfile = new System.Windows.Forms.ComboBox();
this.label59 = new System.Windows.Forms.Label();
this.label57 = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
this.gifColors = new System.Windows.Forms.ComboBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.mp4Enc = new System.Windows.Forms.ComboBox();
this.label10 = new System.Windows.Forms.Label();
this.debugTab = new Cyotek.Windows.Forms.TabListPage();
this.label7 = new System.Windows.Forms.Label();
this.serverCombox = new System.Windows.Forms.ComboBox();
@@ -193,9 +170,6 @@
((System.ComponentModel.ISupportInitialize)(this.ncnnThreads)).BeginInit();
this.vidExportTab.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.minOutVidLength)).BeginInit();
this.tabListPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.vp9Crf)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.mp4Crf)).BeginInit();
this.debugTab.SuspendLayout();
this.SuspendLayout();
//
@@ -209,7 +183,6 @@
this.settingsTabList.Controls.Add(this.tabListPage2);
this.settingsTabList.Controls.Add(this.aiOptsPage);
this.settingsTabList.Controls.Add(this.vidExportTab);
this.settingsTabList.Controls.Add(this.tabListPage1);
this.settingsTabList.Controls.Add(this.debugTab);
this.settingsTabList.ForeColor = System.Drawing.Color.DodgerBlue;
this.settingsTabList.Location = new System.Drawing.Point(12, 62);
@@ -1613,344 +1586,6 @@
this.label8.TabIndex = 30;
this.label8.Text = "Minimum Loop Video Length (Seconds)";
//
// tabListPage1
//
this.tabListPage1.Controls.Add(this.imgSeqQuality);
this.tabListPage1.Controls.Add(this.pixFmt);
this.tabListPage1.Controls.Add(this.label75);
this.tabListPage1.Controls.Add(this.label13);
this.tabListPage1.Controls.Add(this.vp9Crf);
this.tabListPage1.Controls.Add(this.mp4Crf);
this.tabListPage1.Controls.Add(this.imgSeqFormat);
this.tabListPage1.Controls.Add(this.label40);
this.tabListPage1.Controls.Add(this.gifDitherType);
this.tabListPage1.Controls.Add(this.aviColors);
this.tabListPage1.Controls.Add(this.aviCodec);
this.tabListPage1.Controls.Add(this.label60);
this.tabListPage1.Controls.Add(this.proResProfile);
this.tabListPage1.Controls.Add(this.label59);
this.tabListPage1.Controls.Add(this.label57);
this.tabListPage1.Controls.Add(this.label19);
this.tabListPage1.Controls.Add(this.gifColors);
this.tabListPage1.Controls.Add(this.label17);
this.tabListPage1.Controls.Add(this.label14);
this.tabListPage1.Controls.Add(this.label12);
this.tabListPage1.Controls.Add(this.mp4Enc);
this.tabListPage1.Controls.Add(this.label10);
this.tabListPage1.ForeColor = System.Drawing.Color.White;
this.tabListPage1.Name = "tabListPage1";
this.tabListPage1.Size = new System.Drawing.Size(762, 419);
this.tabListPage1.Text = "Encoding Settings";
//
// imgSeqQuality
//
this.imgSeqQuality.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.imgSeqQuality.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.imgSeqQuality.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.imgSeqQuality.ForeColor = System.Drawing.Color.White;
this.imgSeqQuality.FormattingEnabled = true;
this.imgSeqQuality.Items.AddRange(new object[] {
"Maximum Quality",
"High Quality",
"Medium Quality",
"Low Quality",
"Lowest Quality"});
this.imgSeqQuality.Location = new System.Drawing.Point(486, 247);
this.imgSeqQuality.Name = "imgSeqQuality";
this.imgSeqQuality.Size = new System.Drawing.Size(194, 21);
this.imgSeqQuality.TabIndex = 116;
//
// pixFmt
//
this.pixFmt.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.pixFmt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.pixFmt.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.pixFmt.ForeColor = System.Drawing.Color.White;
this.pixFmt.FormattingEnabled = true;
this.pixFmt.Items.AddRange(new object[] {
"yuv420p (8-Bit Color, 4:2:0 Sampling - Recommended)",
"yuv444p (8-Bit Color, 4:4:4 Sampling - May not work with some encoders!)",
"yuv420p10le (10-Bit Color, 4:2:0 Sampling - May not work with some encoders!)",
"yuv444p10le (10-Bit Color, 4:4:4 Sampling - May not work with some encoders!)"});
this.pixFmt.Location = new System.Drawing.Point(280, 127);
this.pixFmt.Name = "pixFmt";
this.pixFmt.Size = new System.Drawing.Size(400, 21);
this.pixFmt.TabIndex = 115;
//
// label75
//
this.label75.AutoSize = true;
this.label75.Location = new System.Drawing.Point(10, 130);
this.label75.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label75.Name = "label75";
this.label75.Size = new System.Drawing.Size(190, 13);
this.label75.TabIndex = 114;
this.label75.Text = "MP4/MKV/WEBM/MOV: Color Format";
//
// label13
//
this.label13.AutoSize = true;
this.label13.ForeColor = System.Drawing.Color.Silver;
this.label13.Location = new System.Drawing.Point(393, 101);
this.label13.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(225, 13);
this.label13.TabIndex = 113;
this.label13.Text = "Lower means higher quality and bigger filesize.";
//
// vp9Crf
//
this.vp9Crf.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.vp9Crf.ForeColor = System.Drawing.Color.White;
this.vp9Crf.Location = new System.Drawing.Point(280, 98);
this.vp9Crf.Maximum = new decimal(new int[] {
60,
0,
0,
0});
this.vp9Crf.Name = "vp9Crf";
this.vp9Crf.Size = new System.Drawing.Size(100, 20);
this.vp9Crf.TabIndex = 112;
this.vp9Crf.Value = new decimal(new int[] {
5,
0,
0,
131072});
//
// mp4Crf
//
this.mp4Crf.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.mp4Crf.ForeColor = System.Drawing.Color.White;
this.mp4Crf.Location = new System.Drawing.Point(280, 68);
this.mp4Crf.Maximum = new decimal(new int[] {
60,
0,
0,
0});
this.mp4Crf.Name = "mp4Crf";
this.mp4Crf.Size = new System.Drawing.Size(100, 20);
this.mp4Crf.TabIndex = 111;
this.mp4Crf.Value = new decimal(new int[] {
5,
0,
0,
131072});
//
// imgSeqFormat
//
this.imgSeqFormat.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.imgSeqFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.imgSeqFormat.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.imgSeqFormat.ForeColor = System.Drawing.Color.White;
this.imgSeqFormat.FormattingEnabled = true;
this.imgSeqFormat.Items.AddRange(new object[] {
"PNG",
"JPG",
"WEBP"});
this.imgSeqFormat.Location = new System.Drawing.Point(280, 247);
this.imgSeqFormat.Name = "imgSeqFormat";
this.imgSeqFormat.Size = new System.Drawing.Size(200, 21);
this.imgSeqFormat.TabIndex = 110;
this.imgSeqFormat.SelectedIndexChanged += new System.EventHandler(this.imgSeqFormat_SelectedIndexChanged);
//
// label40
//
this.label40.AutoSize = true;
this.label40.Location = new System.Drawing.Point(10, 250);
this.label40.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label40.Name = "label40";
this.label40.Size = new System.Drawing.Size(158, 13);
this.label40.TabIndex = 109;
this.label40.Text = "Image Sequence: Image Format";
//
// gifDitherType
//
this.gifDitherType.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.gifDitherType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.gifDitherType.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.gifDitherType.ForeColor = System.Drawing.Color.White;
this.gifDitherType.FormattingEnabled = true;
this.gifDitherType.Items.AddRange(new object[] {
"bayer (Recommended)",
"floyd_steinberg (Might cause problems with transparency)",
"none (Strong banding, but better for flat colors)"});
this.gifDitherType.Location = new System.Drawing.Point(386, 217);
this.gifDitherType.Name = "gifDitherType";
this.gifDitherType.Size = new System.Drawing.Size(294, 21);
this.gifDitherType.TabIndex = 108;
//
// aviColors
//
this.aviColors.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.aviColors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.aviColors.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.aviColors.ForeColor = System.Drawing.Color.White;
this.aviColors.FormattingEnabled = true;
this.aviColors.Items.AddRange(new object[] {
"yuv420p",
"yuv422p",
"yuv444p",
"rgb24"});
this.aviColors.Location = new System.Drawing.Point(486, 187);
this.aviColors.Name = "aviColors";
this.aviColors.Size = new System.Drawing.Size(194, 21);
this.aviColors.TabIndex = 107;
//
// aviCodec
//
this.aviCodec.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.aviCodec.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.aviCodec.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.aviCodec.ForeColor = System.Drawing.Color.White;
this.aviCodec.FormattingEnabled = true;
this.aviCodec.Items.AddRange(new object[] {
"ffv1",
"huffyuv",
"magicyuv",
"rawvideo"});
this.aviCodec.Location = new System.Drawing.Point(280, 187);
this.aviCodec.Name = "aviCodec";
this.aviCodec.Size = new System.Drawing.Size(200, 21);
this.aviCodec.TabIndex = 106;
//
// label60
//
this.label60.AutoSize = true;
this.label60.Location = new System.Drawing.Point(10, 190);
this.label60.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label60.Name = "label60";
this.label60.Size = new System.Drawing.Size(131, 13);
this.label60.TabIndex = 105;
this.label60.Text = "AVI: Codec / Color Format";
//
// proResProfile
//
this.proResProfile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.proResProfile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.proResProfile.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.proResProfile.ForeColor = System.Drawing.Color.White;
this.proResProfile.FormattingEnabled = true;
this.proResProfile.Items.AddRange(new object[] {
"0 (Proxy)",
"1 (LT)",
"2 (Standard)",
"3 (HQ)",
"4 (4444)",
"5 (4444xq)"});
this.proResProfile.Location = new System.Drawing.Point(280, 157);
this.proResProfile.Name = "proResProfile";
this.proResProfile.Size = new System.Drawing.Size(400, 21);
this.proResProfile.TabIndex = 104;
//
// label59
//
this.label59.AutoSize = true;
this.label59.Location = new System.Drawing.Point(10, 160);
this.label59.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label59.Name = "label59";
this.label59.Size = new System.Drawing.Size(139, 13);
this.label59.TabIndex = 103;
this.label59.Text = "MOV: ProRes Quality Profile";
//
// label57
//
this.label57.AutoSize = true;
this.label57.Location = new System.Drawing.Point(10, 100);
this.label57.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label57.Name = "label57";
this.label57.Size = new System.Drawing.Size(176, 13);
this.label57.TabIndex = 99;
this.label57.Text = "WEBM: Quality Level (CRF) for VP9";
//
// label19
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label19.Location = new System.Drawing.Point(10, 10);
this.label19.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(129, 16);
this.label19.TabIndex = 96;
this.label19.Text = "Encoding Options";
//
// gifColors
//
this.gifColors.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.gifColors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.gifColors.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.gifColors.ForeColor = System.Drawing.Color.White;
this.gifColors.FormattingEnabled = true;
this.gifColors.Items.AddRange(new object[] {
"256 (Max)",
"128 (High)",
"64 (Medium)",
"32 (Low)",
"16 (Very Low)"});
this.gifColors.Location = new System.Drawing.Point(280, 217);
this.gifColors.Name = "gifColors";
this.gifColors.Size = new System.Drawing.Size(100, 21);
this.gifColors.TabIndex = 95;
//
// label17
//
this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(10, 220);
this.label17.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(173, 13);
this.label17.TabIndex = 94;
this.label17.Text = "GIF: Color Amount / Dithering Type";
//
// label14
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Silver;
this.label14.Location = new System.Drawing.Point(393, 71);
this.label14.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(225, 13);
this.label14.TabIndex = 92;
this.label14.Text = "Lower means higher quality and bigger filesize.";
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(10, 70);
this.label12.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(260, 13);
this.label12.TabIndex = 88;
this.label12.Text = "MP4/MKV: Quality Level (CRF) For Selected Encoder";
//
// mp4Enc
//
this.mp4Enc.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.mp4Enc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.mp4Enc.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.mp4Enc.ForeColor = System.Drawing.Color.White;
this.mp4Enc.FormattingEnabled = true;
this.mp4Enc.Items.AddRange(new object[] {
"h264 - Fast, good compatibility, medium quality per filesize",
"h265 - Slower, mixed compatibility, very good quality per filesize",
"h264 NVENC - Fast GPU-accelerated encoding, worse compression than h264",
"h265 NVENC - Fast GPU-accelerated encoding, worse compression than h265",
"AV1 - Experimental, very slow, but most efficient compression"});
this.mp4Enc.Location = new System.Drawing.Point(280, 37);
this.mp4Enc.Name = "mp4Enc";
this.mp4Enc.Size = new System.Drawing.Size(400, 21);
this.mp4Enc.TabIndex = 87;
this.mp4Enc.SelectedIndexChanged += new System.EventHandler(this.mp4Enc_SelectedIndexChanged);
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(10, 40);
this.label10.Margin = new System.Windows.Forms.Padding(10, 10, 10, 7);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(133, 13);
this.label10.TabIndex = 86;
this.label10.Text = "MP4/MKV: Video Encoder";
//
// debugTab
//
this.debugTab.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
@@ -2174,10 +1809,6 @@
this.vidExportTab.ResumeLayout(false);
this.vidExportTab.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.minOutVidLength)).EndInit();
this.tabListPage1.ResumeLayout(false);
this.tabListPage1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.vp9Crf)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mp4Crf)).EndInit();
this.debugTab.ResumeLayout(false);
this.debugTab.PerformLayout();
this.ResumeLayout(false);
@@ -2295,26 +1926,6 @@
private System.Windows.Forms.Label label74;
private System.Windows.Forms.CheckBox jpegFrames;
private System.Windows.Forms.Label label63;
private Cyotek.Windows.Forms.TabListPage tabListPage1;
private System.Windows.Forms.ComboBox gifDitherType;
private System.Windows.Forms.ComboBox aviColors;
private System.Windows.Forms.ComboBox aviCodec;
private System.Windows.Forms.Label label60;
private System.Windows.Forms.ComboBox proResProfile;
private System.Windows.Forms.Label label59;
private System.Windows.Forms.Label label57;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.ComboBox gifColors;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.ComboBox mp4Enc;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.ComboBox imgSeqFormat;
private System.Windows.Forms.Label label40;
private System.Windows.Forms.NumericUpDown mp4Crf;
private System.Windows.Forms.NumericUpDown vp9Crf;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label41;
private System.Windows.Forms.ComboBox autoEncBackupMode;
private System.Windows.Forms.Label label16;
@@ -2325,8 +1936,6 @@
private System.Windows.Forms.Label label58;
private System.Windows.Forms.Panel autoEncBlockPanel;
private HTAlt.WinForms.HTButton resetBtn;
private System.Windows.Forms.ComboBox pixFmt;
private System.Windows.Forms.Label label75;
private System.Windows.Forms.CheckBox disablePreview;
private System.Windows.Forms.Label label76;
private System.Windows.Forms.Label label77;
@@ -2336,6 +1945,5 @@
private System.Windows.Forms.Label label78;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.ComboBox serverCombox;
private System.Windows.Forms.ComboBox imgSeqQuality;
}
}

50
Code/Forms/SettingsForm.cs
View File

@@ -75,9 +75,6 @@ namespace Flowframes.Forms
void SaveSettings ()
{
// Clamp...
mp4Crf.Text = ((int)mp4Crf.Value).Clamp(0, 50).ToString();
vp9Crf.Text = ((int)vp9Crf.Value).Clamp(0, 63).ToString();
// Remove spaces...
torchGpus.Text = torchGpus.Text.Replace(" ", "");
ncnnGpus.Text = ncnnGpus.Text.Replace(" ", "");
@@ -120,18 +117,6 @@ namespace Flowframes.Forms
ConfigParser.SaveGuiElement(maxFps);
ConfigParser.SaveComboxIndex(loopMode);
ConfigParser.SaveGuiElement(fixOutputDuration);
// Encoding
ConfigParser.SaveComboxIndex(mp4Enc);
ConfigParser.SaveComboxIndex(pixFmt);
Config.Set(mp4CrfConfigKey, mp4Crf.Value.ToString());
ConfigParser.SaveGuiElement(vp9Crf);
ConfigParser.SaveComboxIndex(proResProfile);
ConfigParser.SaveGuiElement(aviCodec);
ConfigParser.SaveGuiElement(aviColors);
ConfigParser.SaveGuiElement(gifColors);
ConfigParser.SaveGuiElement(gifDitherType);
ConfigParser.SaveGuiElement(imgSeqFormat);
ConfigParser.SaveComboxIndex(imgSeqQuality);
// Debugging
ConfigParser.SaveComboxIndex(cmdDebugMode);
ConfigParser.SaveComboxIndex(serverCombox);
@@ -179,17 +164,6 @@ namespace Flowframes.Forms
ConfigParser.LoadGuiElement(maxFps);
ConfigParser.LoadComboxIndex(loopMode);
ConfigParser.LoadGuiElement(fixOutputDuration);
// Encoding
ConfigParser.LoadComboxIndex(mp4Enc);
ConfigParser.LoadComboxIndex(pixFmt);
ConfigParser.LoadGuiElement(vp9Crf);
ConfigParser.LoadComboxIndex(proResProfile);
ConfigParser.LoadGuiElement(aviCodec);
ConfigParser.LoadGuiElement(aviColors);
ConfigParser.LoadGuiElement(gifColors);
ConfigParser.LoadGuiElement(gifDitherType);
ConfigParser.LoadGuiElement(imgSeqFormat);
ConfigParser.LoadComboxIndex(imgSeqQuality);
// Debugging
ConfigParser.LoadComboxIndex(cmdDebugMode);
ConfigParser.LoadComboxIndex(serverCombox);
@@ -249,25 +223,6 @@ namespace Flowframes.Forms
CheckModelCacheSize();
}
string mp4CrfConfigKey;
private void mp4Enc_SelectedIndexChanged(object sender, EventArgs e)
{
// string text = mp4Enc.Text.ToUpper().Remove(" ");
//
// if (text.Contains(FfmpegUtils.Codec.H264.ToString().ToUpper()))
// mp4CrfConfigKey = "h264Crf";
//
// if (text.Contains(FfmpegUtils.Codec.H265.ToString().ToUpper()))
// mp4CrfConfigKey = "h265Crf";
//
// if (text.Contains(FfmpegUtils.Codec.Av1.ToString().ToUpper()))
// mp4CrfConfigKey = "av1Crf";
//
// mp4Crf.Value = Config.GetInt(mp4CrfConfigKey);
throw new NotImplementedException();
}
private void modelDownloaderBtn_Click(object sender, EventArgs e)
{
new ModelDownloadForm().ShowDialog();
@@ -289,10 +244,5 @@ namespace Flowframes.Forms
await Config.Reset(3, this);
SettingsForm_Load(null, null);
}
private void imgSeqFormat_SelectedIndexChanged(object sender, EventArgs e)
{
imgSeqQuality.Visible = imgSeqFormat.SelectedIndex != 0;
}
}
}

4
Code/Main/BatchProcessing.cs
View File

@@ -32,7 +32,7 @@ namespace Flowframes.Main
Logger.ClearLogBox();
stopped = false;
Program.mainForm.SetTab("preview");
Program.mainForm.SetTab(Program.mainForm.previewTab.Name);
int initTaskCount = Program.batchQueue.Count;
for (int i = 0; i < initTaskCount; i++)
@@ -60,7 +60,7 @@ namespace Flowframes.Main
OsUtils.ShowNotificationIfInBackground("Flowframes Queue", "Finished queue processing.");
SetBusy(false);
Program.mainForm.SetWorking(false);
Program.mainForm.SetTab("interpolation");
Program.mainForm.SetTab(Program.mainForm.interpOptsTab.Name);
Program.mainForm.CompletionAction();
}

2
Code/Main/Interpolate.cs
View File

@@ -273,7 +273,7 @@ namespace Flowframes
AutoEncode.busy = false;
Program.mainForm.SetWorking(false);
Program.mainForm.SetTab("interpolation");
Program.mainForm.SetTab(Program.mainForm.interpOptsTab.Name);
Logger.LogIfLastLineDoesNotContainMsg("Canceled interpolation.");
if (!string.IsNullOrWhiteSpace(reason) && !noMsgBox)

7
Code/Os/VapourSynthUtils.cs
View File

@@ -60,9 +60,10 @@ namespace Flowframes.Os
if (s.InterpSettings.inputIsFrames || (s.Dedupe && !s.Realtime))
{
string ext = Config.GetBool(Config.Key.jpegFrames) ? "jpg" : "png";
string first = Path.GetFileNameWithoutExtension(IoUtils.GetFileInfosSorted(s.InterpSettings.framesFolder, false).FirstOrDefault().FullName);
l.Add($"clip = core.imwri.Read(r'{Path.Combine(s.InterpSettings.framesFolder, $"%0{first.Length}d.{ext}")}', firstnum={first.GetInt()})"); // Load image sequence with imwri
FileInfo[] frames = IoUtils.GetFileInfosSorted(s.InterpSettings.framesFolder, false, "*.*");
string ext = frames.FirstOrDefault().Extension;
string first = Path.GetFileNameWithoutExtension(frames.FirstOrDefault().FullName);
l.Add($"clip = core.imwri.Read(r'{Path.Combine(s.InterpSettings.framesFolder, $"%0{first.Length}d{ext}")}', firstnum={first.GetInt()})"); // Load image sequence with imwri
l.Add($"clip = core.std.AssumeFPS(clip, fpsnum={s.InterpSettings.inFps.Numerator}, fpsden={s.InterpSettings.inFps.Denominator})"); // Set frame rate for img seq
}
else

2
Code/Ui/InterpolationProgress.cs
View File

@@ -50,7 +50,7 @@ namespace Flowframes.Ui
if (!progressPaused && AiProcess.processTime.IsRunning && Directory.Exists(currentOutdir))
{
if (firstProgUpd && Program.mainForm.IsInFocus())
Program.mainForm.SetTab("preview");
Program.mainForm.SetTab(Program.mainForm.previewTab.Name);
firstProgUpd = false;
string lastFramePath = currentOutdir + "\\" + lastFrame.ToString("00000000") + I.currentSettings.interpExt;

2
Code/Ui/MainUiFunctions.cs
View File

@@ -20,7 +20,7 @@ namespace Flowframes.Ui
public static async Task InitInput (TextBox outputTbox, TextBox inputTbox, TextBox fpsInTbox, bool start = false)
{
Program.mainForm.SetTab("interpolate");
Program.mainForm.SetTab(Program.mainForm.interpOptsTab.Name);
Program.mainForm.ResetInputInfo();
string path = inputTbox.Text.Trim();