diff --git a/Binaries/Win32/ffms1.dll b/Binaries/Win32/ffms1.dll deleted file mode 100644 index fc419e9..0000000 Binary files a/Binaries/Win32/ffms1.dll and /dev/null differ diff --git a/Binaries/Win32/ffms2.dll b/Binaries/Win32/ffms2.dll index d59f612..65ab830 100644 Binary files a/Binaries/Win32/ffms2.dll and b/Binaries/Win32/ffms2.dll differ diff --git a/Binaries/Win64/FFMSSharp.dll b/Binaries/Win64/FFMSSharp.dll index e712759..89f2fa1 100644 Binary files a/Binaries/Win64/FFMSSharp.dll and b/Binaries/Win64/FFMSSharp.dll differ diff --git a/Binaries/Win64/ffms2.dll b/Binaries/Win64/ffms2.dll index 3d21fcd..ee000c2 100644 Binary files a/Binaries/Win64/ffms2.dll and b/Binaries/Win64/ffms2.dll differ diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index 81c907d..9188c67 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -69,7 +69,6 @@ private void InitializeComponent() System.Windows.Forms.Label labelAudioBitrateHint; System.Windows.Forms.Label labelAudioQuality; System.Windows.Forms.Label labelAudioQualityHint; - System.Windows.Forms.Label labelNormalization; System.Windows.Forms.TabPage tabAdvanced; System.Windows.Forms.TableLayoutPanel tableAdvanced; System.Windows.Forms.GroupBox groupAdvancedProcessing; @@ -88,6 +87,7 @@ private void InitializeComponent() System.Windows.Forms.GroupBox groupBox1; System.Windows.Forms.GroupBox groupBox2; System.Windows.Forms.StatusStrip statusStrip; + System.Windows.Forms.Label labelNormalization; this.textBoxIn = new System.Windows.Forms.TextBox(); this.buttonBrowseIn = new System.Windows.Forms.Button(); this.textBoxOut = new System.Windows.Forms.TextBox(); @@ -135,7 +135,6 @@ private void InitializeComponent() this.numericAudioQuality = new System.Windows.Forms.NumericUpDown(); this.numericDelay = new System.Windows.Forms.NumericUpDown(); this.lblDelay = new System.Windows.Forms.Label(); - this.checkFixAudio = new System.Windows.Forms.CheckBox(); this.comboLevels = new System.Windows.Forms.ComboBox(); this.boxDeinterlace = new System.Windows.Forms.CheckBox(); this.boxLoop = new System.Windows.Forms.CheckBox(); @@ -251,7 +250,6 @@ private void InitializeComponent() labelAudioBitrateHint = new System.Windows.Forms.Label(); labelAudioQuality = new System.Windows.Forms.Label(); labelAudioQualityHint = new System.Windows.Forms.Label(); - labelNormalization = new System.Windows.Forms.Label(); tabAdvanced = new System.Windows.Forms.TabPage(); tableAdvanced = new System.Windows.Forms.TableLayoutPanel(); groupAdvancedProcessing = new System.Windows.Forms.GroupBox(); @@ -270,6 +268,7 @@ private void InitializeComponent() groupBox1 = new System.Windows.Forms.GroupBox(); groupBox2 = new System.Windows.Forms.GroupBox(); statusStrip = new System.Windows.Forms.StatusStrip(); + labelNormalization = new System.Windows.Forms.Label(); tableMainForm.SuspendLayout(); groupMain.SuspendLayout(); tableMain.SuspendLayout(); @@ -1359,13 +1358,12 @@ private void InitializeComponent() tableEncodingAudio.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 115F)); tableEncodingAudio.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 76F)); tableEncodingAudio.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 621F)); + tableEncodingAudio.Controls.Add(labelNormalization, 3, 0); tableEncodingAudio.Controls.Add(this.numericNormalization, 5, 0); tableEncodingAudio.Controls.Add(this.boxAudio, 0, 0); tableEncodingAudio.Controls.Add(panelEncodingModeSwapperTwo, 0, 1); tableEncodingAudio.Controls.Add(this.numericDelay, 3, 0); tableEncodingAudio.Controls.Add(this.lblDelay, 2, 0); - tableEncodingAudio.Controls.Add(this.checkFixAudio, 4, 0); - tableEncodingAudio.Controls.Add(labelNormalization, 5, 0); tableEncodingAudio.Dock = System.Windows.Forms.DockStyle.Fill; tableEncodingAudio.Location = new System.Drawing.Point(4, 19); tableEncodingAudio.Margin = new System.Windows.Forms.Padding(0); @@ -1389,7 +1387,7 @@ private void InitializeComponent() 0, 0, 131072}); - this.numericNormalization.Location = new System.Drawing.Point(689, 5); + this.numericNormalization.Location = new System.Drawing.Point(574, 5); this.numericNormalization.Margin = new System.Windows.Forms.Padding(3, 5, 3, 2); this.numericNormalization.Maximum = new decimal(new int[] { 1, @@ -1402,7 +1400,7 @@ private void InitializeComponent() 0, -2147483648}); this.numericNormalization.Name = "numericNormalization"; - this.numericNormalization.Size = new System.Drawing.Size(70, 22); + this.numericNormalization.Size = new System.Drawing.Size(109, 22); this.numericNormalization.TabIndex = 21; this.numericNormalization.Value = new decimal(new int[] { 1, @@ -1610,32 +1608,6 @@ private void InitializeComponent() this.lblDelay.TabIndex = 4; this.lblDelay.Text = "Delay:"; // - // checkFixAudio - // - this.checkFixAudio.AutoSize = true; - this.checkFixAudio.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this.checkFixAudio.Dock = System.Windows.Forms.DockStyle.Left; - this.checkFixAudio.Location = new System.Drawing.Point(305, 2); - this.checkFixAudio.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.checkFixAudio.Name = "checkFixAudio"; - this.checkFixAudio.Size = new System.Drawing.Size(130, 30); - this.checkFixAudio.TabIndex = 5; - this.checkFixAudio.Text = "Fix desync audio"; - this.checkFixAudio.UseVisualStyleBackColor = true; - this.checkFixAudio.CheckedChanged += new System.EventHandler(this.checkFixAudio_CheckedChanged); - // - // labelNormalization - // - labelNormalization.AutoSize = true; - labelNormalization.Dock = System.Windows.Forms.DockStyle.Fill; - labelNormalization.Location = new System.Drawing.Point(575, 0); - labelNormalization.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - labelNormalization.Name = "labelNormalization"; - labelNormalization.Size = new System.Drawing.Size(107, 34); - labelNormalization.TabIndex = 6; - labelNormalization.Text = "Normalization:"; - labelNormalization.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // tabAdvanced // tabAdvanced.AutoScroll = true; @@ -2859,6 +2831,18 @@ private void InitializeComponent() this.listViewContextMenuDelete.Text = "Delete"; this.listViewContextMenuDelete.Click += new System.EventHandler(this.listViewContextMenuDelete_Click); // + // labelNormalization + // + labelNormalization.AutoSize = true; + labelNormalization.Dock = System.Windows.Forms.DockStyle.Fill; + labelNormalization.Location = new System.Drawing.Point(306, 0); + labelNormalization.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + labelNormalization.Name = "labelNormalization"; + labelNormalization.Size = new System.Drawing.Size(261, 34); + labelNormalization.TabIndex = 22; + labelNormalization.Text = "Normalization:"; + labelNormalization.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // MainForm // this.AcceptButton = this.buttonGo; @@ -3069,7 +3053,6 @@ private void InitializeComponent() private System.Windows.Forms.Label txtType; private System.Windows.Forms.ComboBox comboStabType; private System.Windows.Forms.CheckBox checkBoxAlpha; - private System.Windows.Forms.CheckBox checkFixAudio; private System.Windows.Forms.TabPage tabGrid; private System.Windows.Forms.SplitContainer splitContainer1; private System.Windows.Forms.SplitContainer splitContainer2; diff --git a/MainForm.cs b/MainForm.cs index 9c3f6bb..0e0ef43 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -137,6 +137,7 @@ public partial class MainForm : Form public MainForm() { + //ad42af1 FFMSSharp.FFMS2.Initialize(Path.Combine(Environment.CurrentDirectory, "Binaries", "Win64")); _temporaryFilesList = new List(); cache = new ConcurrentDictionary(MAX_PROCESS, MAX_CAPACITY); @@ -300,7 +301,6 @@ private void LoadConfiguration() CRF4k.Value = Decimal.Parse(configuration.AppSettings.Settings["CRF4k"].Value); CRFother.Value = Decimal.Parse(configuration.AppSettings.Settings["CRFother"].Value); checkBoxAlpha.Enabled = boxNGOV.Checked && !checkMP4.Checked; - checkFixAudio.Enabled = boxAudio.Checked; Program.DisablePop = boxDisablePop.Checked; Program.DisableUpdates = boxDisableUpdates.Checked; } @@ -1412,7 +1412,6 @@ void buttonVariableDefault_Click(object sender, EventArgs e) void boxAudio_CheckedChanged(object sender, EventArgs e) { numericAudioQuality.Enabled = boxAudioBitrate.Enabled = numericDelay.Enabled = ((CheckBox)sender).Checked ; - checkFixAudio.Enabled = boxAudio.Checked; numericNormalization.Enabled = boxAudio.Checked; if (boxNGOV.Checked) @@ -1601,7 +1600,7 @@ void SetFile(string path) indexbw.DoWork += delegate (object sender, DoWorkEventArgs e) { logIndexingProgress("Indexing starting..."); - using (FFMSSharp.Indexer indexer = new FFMSSharp.Indexer(path, FFMSSharp.Source.Lavf)) + using (FFMSSharp.Indexer indexer = new FFMSSharp.Indexer(path)) { indexer.UpdateIndexProgress += delegate (object sendertwo, FFMSSharp.IndexingProgressChangeEventArgs etwo) @@ -1885,7 +1884,6 @@ void SetFile(string path) } Program.VideoSource = index.VideoSource(path, videotrack, Environment.ProcessorCount); - index.Dispose(); var frame = Program.VideoSource.GetFrame(0); // We're assuming that the entire video has the same settings here, which should be fine. (These options usually don't vary, I hope.) Program.VideoColorRange = frame.ColorRange; Program.VideoInterlaced = frame.InterlacedFrame; @@ -2088,9 +2086,8 @@ void WriteAvisynthScript(string avsFileName, string avsInputFile) var pluginPath = Path.Combine(Environment.CurrentDirectory, "Binaries", "Win32"); var shortPluginPath = GetCompatiblePath(pluginPath); - string version = checkFixAudio.Checked ? "1" : "2"; avscript.WriteLine($@"PluginPath = ""{shortPluginPath}\"""); - avscript.WriteLine(@"try { LoadPlugin(PluginPath+""ffms"+version+@".dll"") } catch (_) { LoadCPlugin(PluginPath+""ffms"+version+@".dll"") }"); + avscript.WriteLine(@"try { LoadPlugin(PluginPath+""ffms2.dll"") } catch (_) { LoadCPlugin(PluginPath+""ffms2.dll"") }"); if (Filters.Subtitle != null) { diff --git a/MainForm.resx b/MainForm.resx index 1df70c4..c5c8cae 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -177,7 +177,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAM - cwAAAk1TRnQBSQFMAgEBDAEAAZgBBAGYAQQBZAEAAWQBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + cwAAAk1TRnQBSQFMAgEBDAEAAaABBAGgAQQBZAEAAWQBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABkAEBAgABkAEBAgABAQEAAQgGAAFxAQIXAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEA AcAB3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEA A0IBAAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIA @@ -736,6 +736,9 @@ False + + False + False @@ -754,9 +757,6 @@ False - - False - False diff --git a/WebMConverter.csproj b/WebMConverter.csproj index 0872058..2daa691 100644 --- a/WebMConverter.csproj +++ b/WebMConverter.csproj @@ -69,7 +69,7 @@ false - + False Binaries\Win64\FFMSSharp.dll