Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2026-07-13 22:09:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added MKV as MP4 alternative, minor UI improvements

Browse Source
This commit is contained in:
N00MKRAD
2021-01-16 01:19:07 +01:00
parent cdd4d0889a
commit d4ad70829e
5 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Code/AudioVideo/FFmpegUtils.cs
View File

@@ -14,7 +14,7 @@ namespace Flowframes.AudioVideo
public static Codec GetCodec(Interpolate.OutMode mode)
{
if (mode == Interpolate.OutMode.VidMp4)
if (mode == Interpolate.OutMode.VidMp4 || mode == Interpolate.OutMode.VidMkv)
{
int mp4Enc = Config.GetInt("mp4Enc");
if (mp4Enc == 0) return Codec.H264;
@@ -29,7 +29,7 @@ namespace Flowframes.AudioVideo
if (mode == Interpolate.OutMode.VidProRes)
return Codec.ProRes;
if (mode == Interpolate.OutMode.VidAviRaw)
if (mode == Interpolate.OutMode.VidAvi)
return Codec.AviRaw;
return Codec.H264;
@@ -111,9 +111,10 @@ namespace Flowframes.AudioVideo
switch (outMode)
{
case Interpolate.OutMode.VidMp4: ext += "mp4"; break;
case Interpolate.OutMode.VidMkv: ext += "mkv"; break;
case Interpolate.OutMode.VidWebm: ext += "webm"; break;
case Interpolate.OutMode.VidProRes: ext += "mov"; break;
case Interpolate.OutMode.VidAviRaw: ext += "avi"; break;
case Interpolate.OutMode.VidAvi: ext += "avi"; break;
case Interpolate.OutMode.VidGif: ext += "gif"; break;
}

45
Code/Form1.Designer.cs generated
View File

@@ -86,6 +86,7 @@
this.paypalBtn = new HTAlt.WinForms.HTButton();
this.discordBtn = new HTAlt.WinForms.HTButton();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.longProgBar = new HTAlt.WinForms.HTProgressBar();
this.cancelBtn = new System.Windows.Forms.Button();
this.mainTabControl = new HTAlt.WinForms.HTTabControl();
@@ -102,7 +103,6 @@
this.browseOutBtn = new HTAlt.WinForms.HTButton();
this.browseInputFileBtn = new HTAlt.WinForms.HTButton();
this.browseInputBtn = new HTAlt.WinForms.HTButton();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.videoUtilsTab = new System.Windows.Forms.TabPage();
this.label10 = new System.Windows.Forms.Label();
this.utilsExtractAudioCbox = new System.Windows.Forms.CheckBox();
@@ -118,12 +118,12 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.info1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.mainTabControl.SuspendLayout();
this.welcomeTab.SuspendLayout();
this.panel8.SuspendLayout();
this.panel6.SuspendLayout();
this.interpOptsTab.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.videoUtilsTab.SuspendLayout();
this.previewTab.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.previewPicturebox)).BeginInit();
@@ -187,11 +187,12 @@
this.outModeCombox.ForeColor = System.Drawing.Color.White;
this.outModeCombox.FormattingEnabled = true;
this.outModeCombox.Items.AddRange(new object[] {
"MP4 Video (h264/h265)",
"MP4 Video (h264, h265)",
"MKV Video (h264, h265) (Supports more audio codecs than MP4)",
"WEBM Video (Google VP9)",
"MOV Video (Apple ProRes)",
"AVI Video (Uncompressed/Lossless)",
"Animated GIF",
"AVI Video (ffv1, huffyuv, rawvideo)",
"Animated GIF (Not recommended for more than 40 FPS)",
"Image Sequence"});
this.outModeCombox.Location = new System.Drawing.Point(281, 158);
this.outModeCombox.Name = "outModeCombox";
@@ -237,7 +238,7 @@
//
this.label6.AutoSize = true;
this.label6.ForeColor = System.Drawing.Color.White;
this.label6.Location = new System.Drawing.Point(560, 101);
this.label6.Location = new System.Drawing.Point(554, 101);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(15, 15);
this.label6.TabIndex = 11;
@@ -258,11 +259,11 @@
//
this.fpsOutTbox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.fpsOutTbox.ForeColor = System.Drawing.Color.White;
this.fpsOutTbox.Location = new System.Drawing.Point(581, 98);
this.fpsOutTbox.Location = new System.Drawing.Point(574, 98);
this.fpsOutTbox.MinimumSize = new System.Drawing.Size(4, 21);
this.fpsOutTbox.Name = "fpsOutTbox";
this.fpsOutTbox.ReadOnly = true;
this.fpsOutTbox.Size = new System.Drawing.Size(100, 23);
this.fpsOutTbox.Size = new System.Drawing.Size(107, 23);
this.fpsOutTbox.TabIndex = 9;
//
// fpsInTbox
@@ -287,7 +288,7 @@
"x2",
"x4",
"x8"});
this.interpFactorCombox.Location = new System.Drawing.Point(454, 98);
this.interpFactorCombox.Location = new System.Drawing.Point(447, 97);
this.interpFactorCombox.Name = "interpFactorCombox";
this.interpFactorCombox.Size = new System.Drawing.Size(100, 23);
this.interpFactorCombox.TabIndex = 7;
@@ -825,6 +826,18 @@
this.pictureBox1.TabStop = false;
this.toolTip1.SetToolTip(this.pictureBox1, "This is the trained data the AI will use.\r\nDifferent AI models will produce sligh" +
"tly different results. Try them for yourself.");
//
// pictureBox2
//
this.pictureBox2.BackgroundImage = global::Flowframes.Properties.Resources.questmark_72px_bordeer;
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.pictureBox2.Location = new System.Drawing.Point(86, 158);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(29, 21);
this.pictureBox2.TabIndex = 29;
this.pictureBox2.TabStop = false;
this.toolTip1.SetToolTip(this.pictureBox2, "Set your interpolation output format.\r\nEncoding and quality options can be change" +
"d in the Settings.");
//
// longProgBar
//
@@ -1070,18 +1083,6 @@
this.browseInputBtn.Text = "Browse (Folder)";
this.browseInputBtn.UseVisualStyleBackColor = false;
this.browseInputBtn.Click += new System.EventHandler(this.browseInputBtn_Click);
//
// pictureBox2
//
this.pictureBox2.BackgroundImage = global::Flowframes.Properties.Resources.questmark_72px_bordeer;
this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.pictureBox2.Location = new System.Drawing.Point(86, 158);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(29, 21);
this.pictureBox2.TabIndex = 29;
this.pictureBox2.TabStop = false;
this.toolTip1.SetToolTip(this.pictureBox2, "Set your interpolation output format.\r\nEncoding and quality options can be change" +
"d in the Settings.");
//
// videoUtilsTab
//
@@ -1275,6 +1276,7 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.info1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.mainTabControl.ResumeLayout(false);
this.welcomeTab.ResumeLayout(false);
this.welcomeTab.PerformLayout();
@@ -1284,7 +1286,6 @@
this.panel6.PerformLayout();
this.interpOptsTab.ResumeLayout(false);
this.interpOptsTab.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
this.videoUtilsTab.ResumeLayout(false);
this.videoUtilsTab.PerformLayout();
this.previewTab.ResumeLayout(false);

18
Code/Form1.cs
View File

@@ -170,9 +170,10 @@ namespace Flowframes
Interpolate.OutMode GetOutMode()
{
Interpolate.OutMode outMode = Interpolate.OutMode.VidMp4;
if (outModeCombox.Text.ToLower().Contains("mkv")) outMode = Interpolate.OutMode.VidMkv;
if (outModeCombox.Text.ToLower().Contains("webm")) outMode = Interpolate.OutMode.VidWebm;
if (outModeCombox.Text.ToLower().Contains("prores")) outMode = Interpolate.OutMode.VidProRes;
if (outModeCombox.Text.ToLower().Contains("avi")) outMode = Interpolate.OutMode.VidAviRaw;
if (outModeCombox.Text.ToLower().Contains("avi")) outMode = Interpolate.OutMode.VidAvi;
if (outModeCombox.Text.ToLower().Contains("gif")) outMode = Interpolate.OutMode.VidGif;
if (outModeCombox.Text.ToLower().Contains("image")) outMode = Interpolate.OutMode.ImgPng;
return outMode;
@@ -180,9 +181,18 @@ namespace Flowframes
public void SetOutMode(Interpolate.OutMode mode)
{
if (mode == Interpolate.OutMode.VidMp4) outModeCombox.SelectedIndex = 0;
if (mode == Interpolate.OutMode.VidGif) outModeCombox.SelectedIndex = 1;
if (mode == Interpolate.OutMode.ImgPng) outModeCombox.SelectedIndex = 2;
int theIndex = 0;
for(int i = 0; i < outModeCombox.Items.Count; i++)
{
string currentItem = outModeCombox.Items[i].ToString().ToLower();
if (mode == Interpolate.OutMode.VidMkv && currentItem.Contains("mkv")) theIndex = i;
if (mode == Interpolate.OutMode.VidWebm && currentItem.Contains("webm")) theIndex = i;
if (mode == Interpolate.OutMode.VidProRes && currentItem.Contains("prores")) theIndex = i;
if (mode == Interpolate.OutMode.VidAvi && currentItem.Contains("avi")) theIndex = i;
if (mode == Interpolate.OutMode.VidGif && currentItem.Contains("gif")) theIndex = i;
if (mode == Interpolate.OutMode.ImgPng && currentItem.Contains("image")) theIndex = i;
}
outModeCombox.SelectedIndex = theIndex;
}
AI GetAi()

2
Code/Main/Interpolate.cs
View File

@@ -21,7 +21,7 @@ namespace Flowframes
{
public class Interpolate
{
public enum OutMode { VidMp4, VidWebm, VidProRes, VidAviRaw, VidGif, ImgPng }
public enum OutMode { VidMp4, VidMkv, VidWebm, VidProRes, VidAvi, VidGif, ImgPng }
public static int currentInputFrameCount;
public static bool currentlyUsingAutoEnc;

2
Code/Main/InterpolateUtils.cs
View File

@@ -224,7 +224,7 @@ namespace Flowframes.Main
ShowMessage("Interpolation factor is not valid!");
passes = false;
}
if (passes && outMode == i.OutMode.VidGif && fpsOut >= 50)
if (passes && outMode == i.OutMode.VidGif && fpsOut > 50)
{
ShowMessage("Invalid output frame rate!\nGIF does not properly support frame rates above 40 FPS.\nPlease use MP4, WEBM or another video format.");
passes = false;