From 0783d03a796044d91bbfa82db257ca910e9886f1 Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Sat, 30 Jul 2022 10:04:28 +0200 Subject: [PATCH] added hybrid mode debug added hybrid mode debug added intel quick sync (h264 nad h265) ffmpeg bump to 5.1 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 121344 -> 150528 bytes Crunchyroll Downloader/CRD_List_Item.vb | 2 +- .../Crunchyroll Downloader.vbproj | 9 + Crunchyroll Downloader/Main.designer.vb | 9 +- Crunchyroll Downloader/Main.resx | 334 ++++++++---------- Crunchyroll Downloader/Main.vb | 11 +- Crunchyroll Downloader/Trackbar.Designer.vb | 96 +++++ Crunchyroll Downloader/Trackbar.resx | 120 +++++++ Crunchyroll Downloader/Trackbar.vb | 31 ++ .../einstellungen.Designer.vb | 46 ++- Crunchyroll Downloader/einstellungen.resx | 3 - 11 files changed, 449 insertions(+), 212 deletions(-) create mode 100644 Crunchyroll Downloader/Trackbar.Designer.vb create mode 100644 Crunchyroll Downloader/Trackbar.resx create mode 100644 Crunchyroll Downloader/Trackbar.vb diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index e4be901445fdd345eb17b3d2aa38511cb237caf3..bef02c16e5834b6d3dc9a28f3dff92655269a8b9 100644 GIT binary patch delta 12832 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 h84=6u6@~N*3@x|42JVh0;6i92C7zDV})Zp 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 + + Trackbar.vb + + + Form + True @@ -219,6 +225,9 @@ + + Trackbar.vb + network_scan.vb diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb index e2246ad..b8295cb 100644 --- a/Crunchyroll Downloader/Main.designer.vb +++ b/Crunchyroll Downloader/Main.designer.vb @@ -49,6 +49,7 @@ Partial Class Main Me.CheckCRBetaTokenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AddonHTMLToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Timer3OffToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ThreadCount = New System.Windows.Forms.ToolStripMenuItem() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -182,7 +183,7 @@ Partial Class Main ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.TestDownloadToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.AddonHTMLToolStripMenuItem, Me.Timer3OffToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToggleDebugModeToolStripMenuItem, Me.OpenSettingsToolStripMenuItem, Me.TestDownloadToolStripMenuItem, Me.CheckCRBetaTokenToolStripMenuItem, Me.AddonHTMLToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") ' @@ -216,6 +217,11 @@ Partial Class Main Me.Timer3OffToolStripMenuItem.Name = "Timer3OffToolStripMenuItem" resources.ApplyResources(Me.Timer3OffToolStripMenuItem, "Timer3OffToolStripMenuItem") ' + 'ThreadCount + ' + Me.ThreadCount.Name = "ThreadCount" + resources.ApplyResources(Me.ThreadCount, "ThreadCount") + ' 'Main ' Me.ApplyImageInvert = True @@ -270,4 +276,5 @@ Partial Class Main Friend WithEvents CheckCRBetaTokenToolStripMenuItem As ToolStripMenuItem Friend WithEvents AddonHTMLToolStripMenuItem As ToolStripMenuItem Friend WithEvents Timer3OffToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ThreadCount As ToolStripMenuItem End Class diff --git a/Crunchyroll Downloader/Main.resx b/Crunchyroll Downloader/Main.resx index 1a875b0..76ab7bf 100644 --- a/Crunchyroll Downloader/Main.resx +++ b/Crunchyroll Downloader/Main.resx @@ -120,6 +120,13 @@ True + + Link + + + + 818 + Microsoft Sans Serif, 93pt @@ -137,7 +144,6 @@ 840, 546 - 57 @@ -153,12 +159,6 @@ 9 - - Link - - - 818 - True @@ -273,6 +273,24 @@ 842, 630 + + None + + + Flat + + + NoControl + + + 800, 1 + + + 40, 40 + + + 5 + Btn_Close @@ -285,6 +303,24 @@ 1 + + None + + + Flat + + + NoControl + + + 757, 1 + + + 40, 40 + + + 4 + Btn_min @@ -297,6 +333,24 @@ 2 + + Zoom + + + Flat + + + NoControl + + + 641, 18 + + + 80, 35 + + + 3 + Btn_Settings @@ -309,6 +363,21 @@ 3 + + Zoom + + + Flat + + + 124, 18 + + + 80, 35 + + + 2 + Btn_Browser @@ -321,6 +390,24 @@ 4 + + Zoom + + + Flat + + + NoControl + + + 11, 18 + + + 80, 35 + + + 1 + Btn_add @@ -435,6 +522,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ThreadCount + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Main @@ -447,158 +540,53 @@ 877, 17 - - Zoom - - - Flat - - - NoControl - - - 11, 18 - - - 80, 35 - - - 1 - - - Btn_add - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - - - Zoom - - - Flat - - - 124, 18 - - - 80, 35 - - - 2 - - - Btn_Browser - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - Zoom - - - Flat - - - NoControl - - - 641, 18 - - - 80, 35 - - - 3 - - - Btn_Settings - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - None - - - Flat - - - NoControl - - - 757, 1 - - - 40, 40 - - - 4 - - - Btn_min - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - None - - - Flat - - - NoControl - - - 800, 1 - - - 40, 40 - - - 5 - - - Btn_Close - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - 966, 17 + + 233, 22 + + + Toggle Debug Mode + + + 233, 22 + + + Open Settings + + + 233, 22 + + + Check Funimation Token + + + 233, 22 + + + Check CR Beta Token + + + 233, 22 + + + Add-on HTML + + + 233, 22 + + + Timer3 off + + + 233, 22 + + + set hybrid-mode thread count + - 206, 136 + 234, 180 ContextMenuStrip1 @@ -606,40 +594,4 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 205, 22 - - - Toggle Debug Mode - - - 205, 22 - - - Open Settings - - - 205, 22 - - - Check Funimation Token - - - 205, 22 - - - Check CR Beta Token - - - 205, 22 - - - Add-on HTML - - - 205, 22 - - - Timer3 off - \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index ea15efb..507bf3c 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -101,6 +101,7 @@ Public Class Main Public SoftSubs As New List(Of String) Public IncludeLangName As Boolean = False Public LangNameType As Integer = 0 + Public HybridThread As Integer = CInt(Environment.ProcessorCount / 2 - 1) Public TempSoftSubs As New List(Of String) Public AbourtList As New List(Of String) Public watingList As New List(Of String) @@ -585,7 +586,11 @@ Public Class Main LangNameType = Integer.Parse(rkg.GetValue("LangNameType").ToString) Catch ex As Exception End Try - + Try + Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") + HybridThread = Integer.Parse(rkg.GetValue("HybridThread").ToString) + Catch ex As Exception + End Try Try Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") IgnoreSeason = Integer.Parse(rkg.GetValue("IgnoreS1").ToString) @@ -5322,6 +5327,10 @@ Public Class Main Timer3.Enabled = False End Sub + Private Sub ThreadCount_Click(sender As Object, e As EventArgs) Handles ThreadCount.Click + Trackbar.ShowDialog() + End Sub + #End Region diff --git a/Crunchyroll Downloader/Trackbar.Designer.vb b/Crunchyroll Downloader/Trackbar.Designer.vb new file mode 100644 index 0000000..53f6a2f --- /dev/null +++ b/Crunchyroll Downloader/Trackbar.Designer.vb @@ -0,0 +1,96 @@ + _ +Partial Class Trackbar + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.Button1 = New System.Windows.Forms.Button() + Me.TrackBar1 = New System.Windows.Forms.TrackBar() + Me.Label1 = New System.Windows.Forms.Label() + Me.Button2 = New System.Windows.Forms.Button() + CType(Me.TrackBar1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'Button1 + ' + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button1.Location = New System.Drawing.Point(260, 120) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(100, 41) + Me.Button1.TabIndex = 0 + Me.Button1.Text = "Applay" + Me.Button1.UseVisualStyleBackColor = True + ' + 'TrackBar1 + ' + Me.TrackBar1.Location = New System.Drawing.Point(12, 23) + Me.TrackBar1.Maximum = 64 + Me.TrackBar1.Minimum = 2 + Me.TrackBar1.Name = "TrackBar1" + Me.TrackBar1.Size = New System.Drawing.Size(431, 45) + Me.TrackBar1.TabIndex = 1 + Me.TrackBar1.Value = 2 + ' + 'Label1 + ' + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(12, 87) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(431, 20) + Me.Label1.TabIndex = 2 + Me.Label1.Text = "Label1" + Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Button2 + ' + Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button2.Location = New System.Drawing.Point(109, 120) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(100, 41) + Me.Button2.TabIndex = 3 + Me.Button2.Text = "Save" + Me.Button2.UseVisualStyleBackColor = True + ' + 'Trackbar + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(459, 173) + Me.Controls.Add(Me.Button2) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.TrackBar1) + Me.Controls.Add(Me.Button1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "Trackbar" + Me.Text = "Form1" + CType(Me.TrackBar1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents Button1 As Button + Friend WithEvents TrackBar1 As Windows.Forms.TrackBar + Friend WithEvents Label1 As Label + Friend WithEvents Button2 As Button +End Class diff --git a/Crunchyroll Downloader/Trackbar.resx b/Crunchyroll Downloader/Trackbar.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Crunchyroll Downloader/Trackbar.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Crunchyroll Downloader/Trackbar.vb b/Crunchyroll Downloader/Trackbar.vb new file mode 100644 index 0000000..a9de30a --- /dev/null +++ b/Crunchyroll Downloader/Trackbar.vb @@ -0,0 +1,31 @@ +Imports Microsoft.Win32 + +Public Class Trackbar + Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If Main.HybridThread > 64 Then + TrackBar1.Value = 64 + ElseIf Main.HybridThread < 2 Then + TrackBar1.Value = 2 + Else + TrackBar1.Value = Main.HybridThread + End If + Label1.Text = "Selecet thread count: " + TrackBar1.Value.ToString + End Sub + + Private Sub TrackBar1_Scroll(sender As Object, e As EventArgs) Handles TrackBar1.Scroll + Label1.Text = "Selecet thread count: " + TrackBar1.Value.ToString + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Main.HybridThread = TrackBar1.Value + End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader") + + Main.HybridThread = TrackBar1.Value + rk.SetValue("HybridThread", TrackBar1.Value, RegistryValueKind.String) + + Me.Close() + End Sub +End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 3618ae2..2df0c6a 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -110,6 +110,7 @@ Partial Class Einstellungen Me.LangNameType_DD = New MetroFramework.Controls.MetroComboBox() Me.CB_SoftSubSettings = New MetroFramework.Controls.MetroComboBox() Me.GB_Filename_Pre = New System.Windows.Forms.GroupBox() + Me.CB_Ignore = New MetroFramework.Controls.MetroComboBox() Me.KodiSupport = New MetroFramework.Controls.MetroToggle() Me.MetroLink1 = New MetroFramework.Controls.MetroLink() Me.GroupBox12 = New System.Windows.Forms.GroupBox() @@ -146,7 +147,8 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() - Me.CB_Ignore = New MetroFramework.Controls.MetroComboBox() + Me.ListC8 = New System.Windows.Forms.ToolStripMenuItem() + Me.ListC9 = New System.Windows.Forms.ToolStripMenuItem() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -580,7 +582,7 @@ Partial Class Einstellungen ' 'FFMPEG_CommandP1 ' - Me.FFMPEG_CommandP1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListC1, Me.ListC2, Me.ListC3, Me.ListC4, Me.ListC5, Me.ListC6, Me.ListC7}) + Me.FFMPEG_CommandP1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListC1, Me.ListC2, Me.ListC3, Me.ListC4, Me.ListC5, Me.ListC6, Me.ListC7, Me.ListC8, Me.ListC9}) Me.FFMPEG_CommandP1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.FFMPEG_CommandP1.Name = "FFMPEG_CommandP1" Me.FFMPEG_CommandP1.Size = New System.Drawing.Size(63, 20) @@ -1086,7 +1088,7 @@ Partial Class Einstellungen Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 2 + Me.TabControl1.SelectedIndex = 1 Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.TabIndex = 0 Me.TabControl1.UseSelectable = True @@ -1193,6 +1195,20 @@ Partial Class Einstellungen Me.GB_Filename_Pre.TabStop = False Me.GB_Filename_Pre.Text = "Filename Extras" ' + 'CB_Ignore + ' + Me.CB_Ignore.DropDownHeight = 250 + Me.CB_Ignore.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CB_Ignore.FormattingEnabled = True + Me.CB_Ignore.IntegralHeight = False + Me.CB_Ignore.ItemHeight = 23 + Me.CB_Ignore.Items.AddRange(New Object() {"[Default] use season numbers", "ignore Season 1", "ignore all season numbers"}) + Me.CB_Ignore.Location = New System.Drawing.Point(248, 21) + Me.CB_Ignore.Name = "CB_Ignore" + Me.CB_Ignore.Size = New System.Drawing.Size(225, 29) + Me.CB_Ignore.TabIndex = 40 + Me.CB_Ignore.UseSelectable = True + ' 'KodiSupport ' Me.KodiSupport.AutoSize = True @@ -1673,19 +1689,17 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'CB_Ignore + 'ListC8 ' - Me.CB_Ignore.DropDownHeight = 250 - Me.CB_Ignore.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CB_Ignore.FormattingEnabled = True - Me.CB_Ignore.IntegralHeight = False - Me.CB_Ignore.ItemHeight = 23 - Me.CB_Ignore.Items.AddRange(New Object() {"[Default] use season numbers", "ignore Season 1", "ignore all season numbers"}) - Me.CB_Ignore.Location = New System.Drawing.Point(248, 21) - Me.CB_Ignore.Name = "CB_Ignore" - Me.CB_Ignore.Size = New System.Drawing.Size(225, 29) - Me.CB_Ignore.TabIndex = 40 - Me.CB_Ignore.UseSelectable = True + Me.ListC8.Name = "ListC8" + Me.ListC8.Size = New System.Drawing.Size(180, 22) + Me.ListC8.Text = "-c:v h264_qsv" + ' + 'ListC9 + ' + Me.ListC9.Name = "ListC9" + Me.ListC9.Size = New System.Drawing.Size(180, 22) + Me.ListC9.Text = "-c:v hevc_qsv" ' 'Einstellungen ' @@ -1881,4 +1895,6 @@ Partial Class Einstellungen Friend WithEvents MetroLabel3 As MetroFramework.Controls.MetroLabel Friend WithEvents TempTB As MetroFramework.Controls.MetroTextBox Friend WithEvents CB_Ignore As MetroFramework.Controls.MetroComboBox + Friend WithEvents ListC8 As ToolStripMenuItem + Friend WithEvents ListC9 As ToolStripMenuItem End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index f49b9b4..e809bf5 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,9 +126,6 @@ 118, 20 - - 118, 20 - 332, 20