From e4f6c32daced8db2f96d0a8443535d0f74e4bd61 Mon Sep 17 00:00:00 2001 From: moisesmcardona Date: Sun, 12 Apr 2020 16:38:28 -0400 Subject: [PATCH] v1.6: Changed some flags that will be deprecated soon. --- svt-av1_gui/Form1.Designer.vb | 24 ++++++++++++------------ svt-av1_gui/Form1.vb | 20 ++++++++++---------- svt-av1_gui/My Project/AssemblyInfo.vb | 4 ++-- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/svt-av1_gui/Form1.Designer.vb b/svt-av1_gui/Form1.Designer.vb index 4f8121f..92a3d58 100644 --- a/svt-av1_gui/Form1.Designer.vb +++ b/svt-av1_gui/Form1.Designer.vb @@ -32,6 +32,7 @@ Partial Class Form1 Me.Label5 = New System.Windows.Forms.Label() Me.Label6 = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.AdvancedOptionsButton = New System.Windows.Forms.Button() Me.TwoPassEncoding = New System.Windows.Forms.CheckBox() Me.AdditionalArguments = New System.Windows.Forms.TextBox() Me.Label4 = New System.Windows.Forms.Label() @@ -59,7 +60,6 @@ Partial Class Form1 Me.PauseResumeButton = New System.Windows.Forms.Button() Me.ClearLogBtn = New System.Windows.Forms.Button() Me.SaveLogBtn = New System.Windows.Forms.Button() - Me.AdvancedOptionsButton = New System.Windows.Forms.Button() Me.GroupBox1.SuspendLayout() CType(Me.columns, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.rows, System.ComponentModel.ISupportInitialize).BeginInit() @@ -157,7 +157,7 @@ Partial Class Form1 Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(28, 13) Me.Label6.TabIndex = 12 - Me.Label6.Text = "v1.5" + Me.Label6.Text = "v1.6" ' 'GroupBox1 ' @@ -185,6 +185,16 @@ Partial Class Form1 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Encoder Options" ' + 'AdvancedOptionsButton + ' + Me.AdvancedOptionsButton.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.AdvancedOptionsButton.Location = New System.Drawing.Point(304, 116) + Me.AdvancedOptionsButton.Name = "AdvancedOptionsButton" + Me.AdvancedOptionsButton.Size = New System.Drawing.Size(120, 23) + Me.AdvancedOptionsButton.TabIndex = 47 + Me.AdvancedOptionsButton.Text = "Advanced Options" + Me.AdvancedOptionsButton.UseVisualStyleBackColor = True + ' 'TwoPassEncoding ' Me.TwoPassEncoding.AutoSize = True @@ -474,16 +484,6 @@ Partial Class Form1 Me.SaveLogBtn.Text = "Save Log" Me.SaveLogBtn.UseVisualStyleBackColor = True ' - 'AdvancedOptionsButton - ' - Me.AdvancedOptionsButton.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.AdvancedOptionsButton.Location = New System.Drawing.Point(304, 116) - Me.AdvancedOptionsButton.Name = "AdvancedOptionsButton" - Me.AdvancedOptionsButton.Size = New System.Drawing.Size(120, 23) - Me.AdvancedOptionsButton.TabIndex = 47 - Me.AdvancedOptionsButton.Text = "Advanced Options" - Me.AdvancedOptionsButton.UseVisualStyleBackColor = True - ' 'Form1 ' Me.AllowDrop = True diff --git a/svt-av1_gui/Form1.vb b/svt-av1_gui/Form1.vb index 9a91e6d..0251a11 100644 --- a/svt-av1_gui/Form1.vb +++ b/svt-av1_gui/Form1.vb @@ -249,24 +249,24 @@ Public Class Form1 UpdateLog("Encoding Video") Using svtav1Process As New Process() svtav1Process.StartInfo.FileName = "SvtAv1EncApp.exe" - Dim SVTAV1CommandLineString As String = "-enc-mode " + My.Settings.speed.ToString() + " -q " + My.Settings.quantizer.ToString() + " -tile-rows " + My.Settings.TilingRows.ToString() + " -tile-columns " + My.Settings.TilingColumns.ToString() - If My.Settings.HME Then SVTAV1CommandLineString += " -hme 1 " Else SVTAV1CommandLineString += " -hme 0 " - If My.Settings.HME0 Then SVTAV1CommandLineString += " -hme-l0 1 " Else SVTAV1CommandLineString += " -hme-l0 0 " - If My.Settings.HME1 Then SVTAV1CommandLineString += " -hme-l1 1 " Else SVTAV1CommandLineString += " -hme-l1 0 " - If My.Settings.HME2 Then SVTAV1CommandLineString += " -hme-l2 1 " Else SVTAV1CommandLineString += " -hme-l2 0 " - If My.Settings.ClosedGOP Then SVTAV1CommandLineString += " -irefresh-type 2" + Dim SVTAV1CommandLineString As String = "--preset " + My.Settings.speed.ToString() + " -q " + My.Settings.quantizer.ToString() + " --tile-rows " + My.Settings.TilingRows.ToString() + " --tile-columns " + My.Settings.TilingColumns.ToString() + If My.Settings.HME Then SVTAV1CommandLineString += " --hme 1 " Else SVTAV1CommandLineString += " --hme 0 " + If My.Settings.HME0 Then SVTAV1CommandLineString += " --hme-l0 1 " Else SVTAV1CommandLineString += " --hme-l0 0 " + If My.Settings.HME1 Then SVTAV1CommandLineString += " --hme-l1 1 " Else SVTAV1CommandLineString += " --hme-l1 0 " + If My.Settings.HME2 Then SVTAV1CommandLineString += " --hme-l2 1 " Else SVTAV1CommandLineString += " --hme-l2 0 " + If My.Settings.ClosedGOP Then SVTAV1CommandLineString += " --irefresh-type 2" If SourceFrameNum = String.Empty And SourceFrameDen = String.Empty Then - SVTAV1CommandLineString += " -fps " + SourceFrameRate + SVTAV1CommandLineString += " --fps " + SourceFrameRate Else - SVTAV1CommandLineString += " -fps-num " + SourceFrameNum + " -fps-denom " + SourceFrameDen + SVTAV1CommandLineString += " --fps-num " + SourceFrameNum + " --fps-denom " + SourceFrameDen End If If SecondPassEnabled Then If Not SecondPass Then UpdateLog("Performing First Pass Encoding") - SVTAV1CommandLineString += " -enc-mode-2p " + My.Settings.speed.ToString() + " " + My.Settings.AdditionalArguments + " -n " + SourceFrameCount + " -w " + SourceWidth + " -h " + SourceHeight + " -i ""\\.\pipe\in.y4m"" -output-stat-file """ + My.Settings.tempFolder + "/OutputStatFile""" + SVTAV1CommandLineString += " --enc-mode-2p " + My.Settings.speed.ToString() + " " + My.Settings.AdditionalArguments + " -n " + SourceFrameCount + " -w " + SourceWidth + " -h " + SourceHeight + " -i ""\\.\pipe\in.y4m"" --output-stat-file """ + My.Settings.tempFolder + "/OutputStatFile""" Else UpdateLog("Performing Second Pass Encoding") - SVTAV1CommandLineString += " -enc-mode-2p " + My.Settings.speed.ToString() + " " + My.Settings.AdditionalArguments + " -n " + SourceFrameCount + " -w " + SourceWidth + " -h " + SourceHeight + " -i ""\\.\pipe\in.y4m"" -input-stat-file """ + My.Settings.tempFolder + "/OutputStatFile"" -b """ + Output_File + """" + SVTAV1CommandLineString += " --enc-mode-2p " + My.Settings.speed.ToString() + " " + My.Settings.AdditionalArguments + " -n " + SourceFrameCount + " -w " + SourceWidth + " -h " + SourceHeight + " -i ""\\.\pipe\in.y4m"" --input-stat-file """ + My.Settings.tempFolder + "/OutputStatFile"" -b """ + Output_File + """" End If Else SVTAV1CommandLineString += " " + My.Settings.AdditionalArguments + " -n " + SourceFrameCount + " -w " + SourceWidth + " -h " + SourceHeight + " -i ""\\.\pipe\in.y4m"" -b """ + Output_File + """" diff --git a/svt-av1_gui/My Project/AssemblyInfo.vb b/svt-av1_gui/My Project/AssemblyInfo.vb index bcb30ac..7ca90c0 100644 --- a/svt-av1_gui/My Project/AssemblyInfo.vb +++ b/svt-av1_gui/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + +