added av1 support; code clean-up

added av1 enoder options  for intel, nvidia and software (libsvtav1)
changed old CR language values to current ones.
usage of 'is_dubbed' value from the objects json

Crunchyroll Downloader/CRD-Classes.vb

@@ -62,7 +62,6 @@ Public Class CR_Beta_Stream
     Public Sub New(ByVal subLang As String, ByVal Format As String, ByVal Url As String)
         Me.subLang = subLang
         Me.Url = Url
-        'Me.audioLanguage = audioLanguage
         Me.Format = Format
     End Sub
     'Me.audioLanguage,
@@ -70,6 +69,25 @@ Public Class CR_Beta_Stream
         Return String.Format("{0}, {1}, {2}", Me.subLang, Me.Format, Me.Url)
     End Function
 
+End Class
+
+Public Class CR_Subtiles
+    Public Url As String
+    Public SubLangValue As String
+    Public SubLangName As String
+    Public DefaultSub As Boolean
+    Public Index As String
+    Public Sub New(ByVal SubLangValue As String, ByVal SubLangName As String, ByVal Url As String, ByVal Index As String, ByVal DefaultSub As Boolean)
+        Me.SubLangValue = SubLangValue
+        Me.SubLangName = SubLangName
+        Me.Url = Url
+        Me.Index = Index
+        Me.DefaultSub = DefaultSub
+    End Sub
+    Public Overrides Function ToString() As String
+        Return String.Format("{0}, {1}, {2}", Me.SubLangValue, Me.SubLangName, Me.Url, Me.Index, Me.DefaultSub.ToString)
+    End Function
+
 End Class
 Public Class UrlJson
 

Crunchyroll Downloader/ErrorDialog.vb

@@ -160,7 +160,7 @@ Public Class ErrorDialog
             ElseIf HardSub = "Français (France)" Then
                 Return "fr-FR"
             ElseIf HardSub = "العربية (Arabic)" Then
-                Return "ar-ME"
+                Return "ar-SA"
             ElseIf HardSub = "Русский (Russian)" Then
                 Return "ru-RU"
             ElseIf HardSub = "Italiano (Italian)" Then

Crunchyroll Downloader/Main.vb

@@ -125,8 +125,8 @@ Public Class Main
     Dim CR_Unlock_Error As String
     Public Startseite As String = "https://www.crunchyroll.com/"
     Dim SubSprache2 As String
-    Dim URL_DL As String
+    'Dim URL_DL As String
-    Dim Pfad_DL As String
+    'Dim Pfad_DL As String
     Public Grapp_RDY As Boolean = True
     Public Funimation_Grapp_RDY As Boolean = True
     Public Grapp_non_cr_RDY As Boolean = True
@@ -529,6 +529,7 @@ Public Class Main
 
         SoftSubsString = My.Settings.AddedSubs
 
+
         If SoftSubsString = "None" Then
         Else
             Dim SoftSubsStringSplit() As String = SoftSubsString.Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries)
@@ -688,7 +689,7 @@ Public Class Main
                 Return "spa"
             ElseIf HardSub = "fr-FR" Then
                 Return "fre"
-            ElseIf HardSub = "ar-ME" Then
+            ElseIf HardSub = "ar-SA" Then
                 Return "ara"
             ElseIf HardSub = "ru-RU" Then
                 Return "rus"
@@ -1095,8 +1096,8 @@ Public Class Main
         If b = False Then
             b = True
         End If
-        Debug.WriteLine(Streams)
+        'Debug.WriteLine(Streams)
-        Debug.WriteLine(vbCrLf)
+        'Debug.WriteLine(vbCrLf)
         Debug.WriteLine("Website: " + WebsiteURL)
 
 
@@ -1120,7 +1121,9 @@ Public Class Main
             Dim CR_episode_int As String = Nothing
             Dim CR_title As String = Nothing
             Dim CR_audio_locale As String = Nothing
+            Dim CR_audio_isDubbed As Boolean = False
             Dim ResoUsed As String = "x" + Reso.ToString
+            Dim ffmpegInput As String = "-i [Subtitles only]"
 
 #Region "Name + Pfad"
             Dim Pfad2 As String
@@ -1186,8 +1189,7 @@ Public Class Main
             Dim ser As JObject = JObject.Parse(ObjectJson)
             Dim data As List(Of JToken) = ser.Children().ToList
 
-            If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Then
+            For Each item As JProperty In data
-                For Each item As JProperty In data
                     item.CreateReader()
                     Select Case item.Name
 
@@ -1218,26 +1220,28 @@ Public Class Main
                                                         CR_episode = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "")
                                                     Case "duration_ms"
                                                         CR_episode_duration_ms = SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "")
+                                                    Case "is_dubbed"
+                                                        CR_audio_isDubbed = CBool(SubEntry.Value.ToString.Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", ""))
                                                 End Select
-                                            Next
+                                            Next '
                                     End Select
                                 Next
                             Next
                     End Select
                 Next
-                'My.Computer.Clipboard.SetText(ObjectJson)
-                '
-                CR_Anime_Staffel_int = CR_season_number
 
 
+            If CR_episode = Nothing Or CR_episode = "" And CR_episode2 = Nothing Then
+                CR_episode_int = "0"
+            ElseIf CR_episode IsNot Nothing And CR_episode IsNot "" Then
+                CR_episode_int = CR_episode
+            ElseIf CR_episode2 IsNot Nothing Then
+                CR_episode_int = CR_episode2
+            End If
+            CR_Anime_Staffel_int = CR_season_number
 
-                If CR_episode = Nothing Or CR_episode = "" And CR_episode2 = Nothing Then
+
-                    CR_episode_int = "0"
+            If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Then
-                ElseIf CR_episode IsNot Nothing And CR_episode IsNot "" Then
-                    CR_episode_int = CR_episode
-                ElseIf CR_episode2 IsNot Nothing Then
-                    CR_episode_int = CR_episode2
-                End If
 
 
                 If Season_Prefix = "[default season prefix]" Then
@@ -1313,25 +1317,25 @@ Public Class Main
                     End If
                 End If
 
-
-
-                If KodiNaming = True Then
-                    Dim KodiString As String = "[S"
-                    If CR_Anime_Staffel_int = "0" Then
-                        CR_Anime_Staffel_int = "01"
-                    Else
-                        CR_Anime_Staffel_int = "0" + CR_Anime_Staffel_int
-                    End If
-
-                    KodiString = KodiString + CR_Anime_Staffel_int + " E" + AddLeadingZeros(CR_episode_int) ' CR_episode_nr
-                    KodiString = KodiString + "] "
-                    CR_FilenName = KodiString + CR_FilenName
-                End If
-                Debug.WriteLine(CR_FilenName)
 #End Region
             Else
                 CR_FilenName = RemoveExtraSpaces(String.Join(" ", TextBox2_Text.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c)).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(TextBox2_Text, "[^\w\\-]", " "))
             End If
+
+            If KodiNaming = True Then
+                Dim KodiString As String = "[S"
+                If CR_Anime_Staffel_int = "0" Then
+                    CR_Anime_Staffel_int = "01"
+                Else
+                    CR_Anime_Staffel_int = "0" + CR_Anime_Staffel_int
+                End If
+
+                KodiString = KodiString + CR_Anime_Staffel_int + " E" + AddLeadingZeros(CR_episode_int) ' CR_episode_nr
+                KodiString = KodiString + "] "
+                CR_FilenName = KodiString + CR_FilenName
+            End If
+            Debug.WriteLine(CR_FilenName)
+
             CR_FilenName = String.Join(" ", CR_FilenName.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "") 'System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ")
             CR_FilenName = RemoveExtraSpaces(CR_FilenName)
             'My.Computer.FileSystem.WriteAllText("log.log", WebbrowserText, False)
@@ -1350,8 +1354,29 @@ Public Class Main
                 Pfad2 = Chr(34) + Pfad2 + CR_FilenName + VideoFormat + Chr(34)
             End If
 #End Region
+
+#Region "lösche doppel download"
+            Dim Pfad5 As String = Pfad2.Replace(Chr(34), "")
+            If My.Computer.FileSystem.FileExists(Pfad5) And SubsOnly = False Then 'Pfad = Kompeltter Pfad mit Dateinamen + ENdung
+                Me.Invoke(New Action(Function() As Object
+                                         Anime_Add.StatusLabel.Text = "Status: The file video already exists."
+                                         Me.Text = "Status: The file video already exists."
+                                         Me.Invalidate()
+                                         Return Nothing
+                                     End Function))
+                If MessageBox.Show("The file " + Pfad5 + " already exists." + vbNewLine + "You want to override it?", "File exists!", MessageBoxButtons.OKCancel) = DialogResult.OK Then
+                    Try
+                        My.Computer.FileSystem.DeleteFile(Pfad5)
+                    Catch ex As Exception
+                    End Try
+                Else
+                    Grapp_RDY = True
+                    Exit Sub
+                End If
+            End If
+#End Region
+
 #Region "Chapters"
-            'MsgBox(ObjectsURLBuilder4(0))
             Dim Mdata_File As String = Application.StartupPath + "\" + ObjectsURLBuilder4(0) + "-mdata.txt"
 
             If CR_Chapters = True Then
@@ -1360,16 +1385,6 @@ Public Class Main
                 Dim ChaptersUrl As String = "https://static.crunchyroll.com/datalab-intro-v2/" + ObjectsURLBuilder4(0) + ".json"
                 Dim ChaptersJson As String = Nothing
 
-                'Try
-                '    Using client As New WebClient()
-                '        client.Encoding = System.Text.Encoding.UTF8
-                '        client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), ""))
-                '        ChaptersJson = client.DownloadString(ChaptersUrl)
-                '    End Using
-                'Catch ex As Exception
-                '    Debug.WriteLine("no Chapter data... ignoring")
-
-                'End Try
 
                 ChaptersJson = Curl(ChaptersUrl)
 
@@ -1381,11 +1396,6 @@ Public Class Main
                     ChaptersJson = Nothing
                     Debug.WriteLine("no Chapter data... ignoring")
                 End If
-
-                'Debug.WriteLine("ChaptersJson: " + ChaptersJson)
-                'Debug.WriteLine("ChaptersUrl: " + ChaptersUrl)
-
-                'MsgBox(ChaptersJson)
                 If ChaptersJson IsNot Nothing Then
 
                     Dim StartTime As String() = ChaptersJson.Split(New String() {Chr(34) + "startTime" + Chr(34) + ": "}, System.StringSplitOptions.RemoveEmptyEntries)
@@ -1428,7 +1438,6 @@ Public Class Main
                     Else
                         Metadata = My.Resources.ffmpeg_metadata.Replace("[Titel]", CR_FilenName).Replace("[Start]", StartTime_ms).Replace("[END]", EndTime_ms).Replace("[after]", AfterTime_ms).Replace("[duration_ms]", CR_episode_duration_ms)
 
-
                     End If
 
                     If Metadata = Nothing Then
@@ -1480,96 +1489,7 @@ Public Class Main
 
             Dim CR_HardSubLang As String = SubSprache.CR_Value
 #End Region
-#Region "Download softsub file or build ffmpeg cmd"
-            Dim SoftSubs2 As New List(Of String)
-            If SoftSubs.Count > 0 Then
-                For i As Integer = 0 To SoftSubs.Count - 1
-                    If CBool(InStr(VideoJson, Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then
-                        SoftSubs2.Add(SoftSubs(i))
-                    Else
-                        '
-                        'MsgBox("Softsubtitle for " + SoftSubs(i) + " is not avalible.", MsgBoxStyle.Information)
-                    End If
-                Next
-            End If
-            Dim SoftSubMergeURLs As String = Nothing
-            Dim SoftSubMergeMaps As String = " -map 0:v -map 0:a"
-            Dim SoftSubMergeMetatata As String = Nothing
-            Dim IndexMoveMap As Integer = 1
-            If CR_MetadataUsage = True Then
-                IndexMoveMap = 2
-            End If
-            If SoftSubs2.Count > 0 Then
-                If MergeSubs = True And SubsOnly = False Then
-                    Dim DispositionIndex As Integer = 69
-                    Debug.WriteLine("Softsubs Default: " + DefaultSubCR)
 
-                    For i As Integer = 0 To SoftSubs2.Count - 1
-                        Debug.WriteLine("Softsubs: " + SoftSubs2(i))
-
-                        If SoftSubs2(i) = DefaultSubCR Then
-                            DispositionIndex = i
-                        End If
-                        Dim SoftSub As String() = VideoJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
-                        Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
-                        Dim SoftSub_3 As String = SoftSub_2(0).Replace("&", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
-                        If SoftSubMergeURLs = Nothing Then
-                            SoftSubMergeURLs = " -i " + Chr(34) + SoftSub_3 + Chr(34)
-                        Else
-                            SoftSubMergeURLs = SoftSubMergeURLs + " -i " + Chr(34) + SoftSub_3 + Chr(34)
-                        End If
-                        SoftSubMergeMaps = SoftSubMergeMaps + " -map " + (i + IndexMoveMap).ToString
-                        If SoftSubMergeMetatata = Nothing Then
-                            SoftSubMergeMetatata = " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSubs2(i)) + " -metadata:s:s:" + i.ToString + " title=" + Chr(34) + HardSubValuesToDisplay(SoftSubs2(i)) + Chr(34) + " -metadata:s:s:" + i.ToString + " handler_name=" + Chr(34) + HardSubValuesToDisplay(SoftSubs2(i)) + Chr(34)
-                        Else
-                            SoftSubMergeMetatata = SoftSubMergeMetatata + " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSubs2(i)) + " -metadata:s:s:" + i.ToString + " title=" + Chr(34) + HardSubValuesToDisplay(SoftSubs2(i)) + Chr(34) + " -metadata:s:s:" + i.ToString + " handler_name=" + Chr(34) + HardSubValuesToDisplay(SoftSubs2(i)) + Chr(34)
-                        End If
-                    Next
-                    Debug.WriteLine("-disposition:s: " + DispositionIndex.ToString)
-
-                    If DispositionIndex = 69 Then
-                    Else
-                        SoftSubMergeMetatata = SoftSubMergeMetatata + " -disposition:s:" + DispositionIndex.ToString + " default"
-                    End If
-                Else
-                    For i As Integer = 0 To SoftSubs2.Count - 1
-                        Dim i2 As Integer = i
-                        Me.Invoke(New Action(Function() As Object
-                                                 Anime_Add.StatusLabel.Text = "Status: downloading subtitle file " + HardSubValuesToDisplay(SoftSubs2(i2))
-                                                 Me.Text = "Status: downloading subtitle file " + HardSubValuesToDisplay(SoftSubs2(i2))
-                                                 Me.Invalidate()
-                                                 Return Nothing
-                                             End Function))
-                        Dim SoftSub As String() = VideoJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
-                        Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
-                        Dim SoftSub_3 As String = SoftSub_2(0).Replace("&", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
-                        'MsgBox(SoftSub_3)
-                        Dim str0 As String = Nothing
-                        If System.Environment.OSVersion.Version.Major < 10 Then
-                            str0 = Curl(SoftSub_3)
-                        Else
-                            Dim client0 As New WebClient
-                            client0.Encoding = Encoding.UTF8
-                            str0 = client0.DownloadString(SoftSub_3) 'Curl(SoftSub_3)
-                        End If
-
-                        'MsgBox(str0)
-                        Dim Pfad3 As String = Pfad2.Replace(Chr(34), "")
-                        Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + "." + GetSubFileLangName(SoftSubs2(i)) + Path.GetExtension(Pfad3)), "ass")
-                        'MsgBox(FN)
-                        If i = 0 And IncludeLangName = False Then
-                            FN = Path.ChangeExtension(Path.GetFileName(Pfad3), "ass")
-                            'MsgBox(FN)
-                        End If
-                        Dim Pfad4 As String = Path.Combine(Path.GetDirectoryName(Pfad3), FN)
-                        'MsgBox(Pfad4)
-                        'File.WriteAllText(Pfad4, str0, Encoding.UTF8)
-                        WriteText(Pfad4, str0)
-                        Pause(3)
-                    Next
-                End If
-            End If
-#End Region
 #Region "m3u8 suche"
 
 
@@ -1619,19 +1539,21 @@ Public Class Main
                         For Each MetaEntrys As JProperty In item.Values
                             Select Case MetaEntrys.Name
                                 Case "audio_locale"
-                                    If CR_audio_locale IsNot "ja-JP" Then
+                                    If CR_audio_isDubbed = True Then
                                         Dim AudioTag As String = MetaEntrys.Value.ToString
                                         CR_audio_locale = String.Join(" ", AudioTag.Split(invalids, StringSplitOptions.RemoveEmptyEntries)).TrimEnd("."c).Replace(Chr(34), "").Replace("\", "").Replace("/", "").Replace(":", "")
+                                    Else
+                                        CR_audio_locale = "ja-JP"
                                     End If
-                                Case "subtitles"
+                                    'Case "subtitles"
-                                    Dim SubtitleSubData As List(Of JToken) = MetaEntrys.Children().ToList
+                                    '    Dim SubtitleSubData As List(Of JToken) = MetaEntrys.Children().ToList
-                                    For Each SubtitleSubItem As JObject In SubtitleSubData
+                                    '    For Each SubtitleSubItem As JObject In SubtitleSubData
-                                        'MsgBox(SubtitleSubItem.Children().ToList.Count.ToString)
+                                    '        'MsgBox(SubtitleSubItem.Children().ToList.Count.ToString)
-                                        If SubtitleSubItem.Children().ToList.Count > 2 Then
+                                    '        If SubtitleSubItem.Children().ToList.Count > 2 Then
-                                            CR_audio_locale = "ja-JP"
+                                    '            CR_audio_locale = "ja-JP"
-                                        End If
+                                    '        End If
-                                        Exit For
+                                    '        Exit For
-                                    Next
+                                    '    Next
                             End Select
 
                         Next
@@ -1696,112 +1618,160 @@ Public Class Main
             End If
 
 #End Region
-#Region "lösche doppel download"
+
-            Dim Pfad5 As String = Pfad2.Replace(Chr(34), "")
+#Region "GetResolution"
-            If My.Computer.FileSystem.FileExists(Pfad5) And SubsOnly = False Then 'Pfad = Kompeltter Pfad mit Dateinamen + ENdung
+
-                Me.Invoke(New Action(Function() As Object
+            If Reso = 42 And HybridMode = False Then
-                                         Anime_Add.StatusLabel.Text = "Status: The file video already exists."
+
-                                         Me.Text = "Status: The file video already exists."
+                ffmpegInput = "-i " + Chr(34) + CR_URI_Master + Chr(34)
-                                         Me.Invalidate()
+
-                                         Return Nothing
+            Else
-                                     End Function))
+
-                If MessageBox.Show("The file " + Pfad5 + " already exists." + vbNewLine + "You want to override it?", "File exists!", MessageBoxButtons.OKCancel) = DialogResult.OK Then
+                Dim str As String = Nothing
-                    Try
+
-                        My.Computer.FileSystem.DeleteFile(Pfad5)
+                str = Curl(CR_URI_Master)
-                    Catch ex As Exception
+
-                    End Try
+                If CBool(InStr(str, "x" + Reso.ToString + ",")) Then
+                    ResoUsed = "x" + Reso.ToString
                 Else
-                    Grapp_RDY = True
+                    If CBool(InStr(str, ResoSave + ",")) Then
-                    Exit Sub
+                        ResoUsed = ResoSave
+                    Else
+                        Me.Invoke(New Action(Function() As Object
+                                                 DialogTaskString = "Resolution"
+                                                 ResoNotFoundString = str
+                                                 ErrorDialog.ShowDialog()
+                                                 Return Nothing
+                                             End Function))
+                        If UserCloseDialog = True Then
+                            Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
+                        Else
+                            ResoUsed = ResoBackString
+                            ResoSave = ResoBackString
+                        End If
+                    End If
+                End If
+                Dim ffmpeg_url_3 As String = Nothing
+                Dim LineChar As String = vbLf
+                If CBool(InStr(str, vbCrLf)) Then
+                    LineChar = vbCrLf
+                ElseIf CBool(InStr(str, vbCr)) Then
+                    LineChar = vbCr
+                End If
+                Dim ffmpeg_url_1 As String() = str.Split(New String() {LineChar}, System.StringSplitOptions.RemoveEmptyEntries)
+
+                For i As Integer = 0 To ffmpeg_url_1.Count - 2 'Step 2
+                    If CBool(InStr(ffmpeg_url_1(i), ResoUsed + ",")) Then
+                        ffmpeg_url_3 = ffmpeg_url_1(i + 1)
+                    End If
+                Next
+
+
+                ffmpegInput = "-i " + Chr(34) + ffmpeg_url_3.Trim() + Chr(34)
+
+            End If
+
+
+
+#End Region
+
+#Region "GetSoftsubs"
+            Dim SoftSubsAvailable As New List(Of String)
+
+            Dim SoftSubsList As New List(Of CR_Subtiles)
+
+            If SoftSubs.Count > 0 Then
+                For i As Integer = 0 To SoftSubs.Count - 1
+                    If CBool(InStr(VideoJson, Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubs(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34))) Then
+                        SoftSubsAvailable.Add(SoftSubs(i))
+                    End If
+                Next
+            End If
+
+            If SoftSubsAvailable.Count > 0 Then
+
+                Debug.WriteLine("Softsubs Default: " + DefaultSubCR)
+
+                For i As Integer = 0 To SoftSubsAvailable.Count - 1
+
+                    Dim SoftSub As String() = VideoJson.Split(New String() {Chr(34) + "locale" + Chr(34) + ":" + Chr(34) + SoftSubsAvailable(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+                    Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
+                    Dim SoftSub_3 As String = SoftSub_2(0).Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
+                    SoftSubsList.Add(New CR_Subtiles(SoftSubsAvailable(i), HardSubValuesToDisplay(SoftSubsAvailable(i)), " -i " + Chr(34) + SoftSub_3 + Chr(34), i.ToString, SoftSubsAvailable(i) = DefaultSubCR))
+
+                Next
+
+
+                If MergeSubs = True And SubsOnly = False Then
+                    Dim DispositionIndex As Integer = 69
+                    Dim SoftSubMergeURLs As String = ""
+                    Dim SoftSubMergeMaps As String = " -map 0:v -map 0:a"
+                    Dim SoftSubMergeMetatata As String = ""
+                    Dim IndexMoveMap As Integer = 1
+                    If CR_MetadataUsage = True Then
+                        IndexMoveMap = 2
+                    End If
+
+                    For i As Integer = 0 To SoftSubsList.Count - 1
+
+                        SoftSubMergeURLs = SoftSubMergeURLs + " " + SoftSubsList(i).Url
+                        SoftSubMergeMaps = SoftSubMergeMaps + " -map " + (i + IndexMoveMap).ToString
+                        SoftSubMergeMetatata = SoftSubMergeMetatata + " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSubsList(i).SubLangValue) + " -metadata:s:s:" + i.ToString + " title=" + Chr(34) + SoftSubsList(i).SubLangName + Chr(34) + " -metadata:s:s:" + i.ToString + " handler_name=" + Chr(34) + SoftSubsList(i).SubLangName + Chr(34)
+
+                        If SoftSubsList(i).DefaultSub = True Then
+                            DispositionIndex = i
+                        End If
+
+                    Next
+
+                    Debug.WriteLine("-disposition:s: " + DispositionIndex.ToString)
+
+                    If DispositionIndex < 69 Then
+                        SoftSubMergeMetatata = SoftSubMergeMetatata + " -disposition:s:" + DispositionIndex.ToString + " default"
+                    End If
+
+                    If CR_MetadataUsage = False Then
+                        ffmpegInput = ffmpegInput + " " + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command_temp + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale)
+                    Else
+                        ffmpegInput = ffmpegInput + " -i " + Chr(34) + Mdata_File + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " -map_metadata 1 " + ffmpeg_command_temp + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale)
+
+                    End If
+
+                Else
+
+                    For i As Integer = 0 To SoftSubsList.Count - 1
+                        Dim i2 As Integer = i
+                        Me.Invoke(New Action(Function() As Object
+                                                 Anime_Add.StatusLabel.Text = "Status: downloading subtitle file " + SoftSubsList(i2).SubLangName
+                                                 Me.Text = "Status: downloading subtitle file " + SoftSubsList(i2).SubLangName
+                                                 Me.Invalidate()
+                                                 Return Nothing
+                                             End Function))
+
+                        Dim SubText As String = ""
+                        SubText = Curl(SoftSubsList(i2).Url.Replace(" -i ", "").Replace(Chr(34), ""))
+                        Dim Pfad3 As String = Pfad2.Replace(Chr(34), "")
+                        Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + "." + GetSubFileLangName(SoftSubsList(i2).SubLangValue) + Path.GetExtension(Pfad3)), "ass")
+                        If i = 0 And IncludeLangName = False Then
+                            FN = Path.ChangeExtension(Path.GetFileName(Pfad3), "ass")
+                        End If
+                        Dim Pfad4 As String = Path.Combine(Path.GetDirectoryName(Pfad3), FN)
+                        WriteText(Pfad4, SubText)
+                        Pause(3)
+                    Next
+
+                    If CR_MetadataUsage = False Then
+                        ffmpegInput = ffmpegInput + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale) + " " + ffmpeg_command_temp
+                    Else
+                        ffmpegInput = ffmpegInput + " -i " + Chr(34) + Mdata_File + Chr(34) + " -map_metadata 1" + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale) + " " + ffmpeg_command_temp
+                    End If
                 End If
             End If
+
+            ffmpegInput = RemoveExtraSpaces(ffmpegInput)
 #End Region
 
 
-            If SubsOnly = False Then
-                If Reso = 42 And HybridMode = False Then
-                    If MergeSubs = True And CR_MetadataUsage = False Then
-                        URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command_temp + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale)
-                    ElseIf MergeSubs = False And CR_MetadataUsage = False Then
-                        URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale) + " " + ffmpeg_command_temp
-                    ElseIf MergeSubs = True And CR_MetadataUsage = True Then
-                        URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + "-i " + Chr(34) + Mdata_File + Chr(34) + "-map_metadata 1" + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command_temp + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale)
-                    ElseIf MergeSubs = False And CR_MetadataUsage = True Then
-                        URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + "-i " + Chr(34) + Mdata_File + Chr(34) + "-map_metadata 1" + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale) + " " + ffmpeg_command_temp
-
-                    End If
-                    'MsgBox(URL_DL)
-                Else
-
-                    Dim str As String = Nothing
-
-                    If System.Environment.OSVersion.Version.Major < 10 Then
-                        str = Curl(CR_URI_Master)
-                    Else
-                        Dim client As New System.Net.WebClient
-                        client.Encoding = Encoding.UTF8
-                        str = client.DownloadString(CR_URI_Master)
-                    End If
-
-                    'MsgBox(str)
-                    If CBool(InStr(str, "x" + Reso.ToString + ",")) Then
-                        ResoUsed = "x" + Reso.ToString
-                    Else
-                        'MsgBox(str)
-                        If CBool(InStr(str, ResoSave + ",")) Then
-                            ResoUsed = ResoSave
-                        Else
-                            Me.Invoke(New Action(Function() As Object
-                                                     DialogTaskString = "Resolution"
-                                                     ResoNotFoundString = str
-                                                     ErrorDialog.ShowDialog()
-                                                     Return Nothing
-                                                 End Function))
-                            'MsgBox(ResoBackString)
-                            If UserCloseDialog = True Then
-                                Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
-                            Else
-                                'MsgBox(ResoBackString)
-                                ResoUsed = ResoBackString
-                                ResoSave = ResoBackString
-                            End If
-                        End If
-                    End If
-                    Dim ffmpeg_url_3 As String = Nothing
-                    Dim LineChar As String = vbLf
-                    If CBool(InStr(str, vbCrLf)) Then
-                        LineChar = vbCrLf
-                    ElseIf CBool(InStr(str, vbCr)) Then
-                        LineChar = vbCr
-                    End If
-                    Dim ffmpeg_url_1 As String() = str.Split(New String() {LineChar}, System.StringSplitOptions.RemoveEmptyEntries)
-
-                    For i As Integer = 0 To ffmpeg_url_1.Count - 2 'Step 2
-                        If CBool(InStr(ffmpeg_url_1(i), ResoUsed + ",")) Then
-                            ffmpeg_url_3 = ffmpeg_url_1(i + 1)
-                        End If
-                    Next
-                    'MsgBox(ffmpeg_url_3)
-                    Debug.WriteLine("Line 2120-CR_audio_locale: " + CR_audio_locale)
-
-                    If MergeSubs = True And CR_MetadataUsage = False Then
-                        URL_DL = "-i " + Chr(34) + ffmpeg_url_3.Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command_temp + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale)
-                    ElseIf MergeSubs = False And CR_MetadataUsage = False Then
-                        URL_DL = "-i " + Chr(34) + ffmpeg_url_3.Trim() + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale) + " " + ffmpeg_command_temp
-                    ElseIf MergeSubs = True And CR_MetadataUsage = True Then
-                        URL_DL = "-i " + Chr(34) + ffmpeg_url_3.Trim() + Chr(34) + " -i " + Chr(34) + Mdata_File + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " -map_metadata 1" + " " + ffmpeg_command_temp + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale)
-                    ElseIf MergeSubs = False And CR_MetadataUsage = True Then
-                        URL_DL = "-i " + Chr(34) + ffmpeg_url_3.Trim() + Chr(34) + " -i " + Chr(34) + Mdata_File + Chr(34) + " -map_metadata 1" + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale) + " " + ffmpeg_command_temp
-
-                    End If
-
-                    'If MergeSubs = True And CR_MetadataUsage = False Then
-                    '    URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s " + MergeSubsFormat + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale)
-                    'Else
-                    '    URL_DL = "-i " + Chr(34) + ffmpeg_url_3(0).Trim() + Chr(34) + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_audio_locale) + " " + ffmpeg_command_temp
-                    'End If
-                End If
-            End If
 #Region "thumbnail"
             Dim thumbnail As String() = ObjectJson.Split(New String() {"https://"}, System.StringSplitOptions.RemoveEmptyEntries)
             Dim thumbnail3 As String = ""
@@ -1823,23 +1793,25 @@ Public Class Main
 
 #End Region
 #Region "item constructor"
-            Dim SubType_Value As String = Nothing 'HardSubValuesToDisplay(SubSprache2.Replace(Chr(34), ""))
-
-            'MsgBox(CR_HardSubLang)
 
+#Region "Display Hard_Softsubs"
+            Dim SubType_Value As String = Nothing
             If Not CR_HardSubLang = "" Then
                 SubType_Value = "Hardsub: " + HardSubValuesToDisplay(CR_HardSubLang)
             End If
-
+            If SoftSubsList.Count > 0 And CR_HardSubLang = "" Then
-            If SoftSubs2.Count > 0 And CR_HardSubLang = "" Then
                 SubType_Value = "Softsubs: "
-                For i As Integer = 0 To SoftSubs2.Count - 1
+                For i As Integer = 0 To SoftSubsList.Count - 1
-                    SubType_Value = SubType_Value + HardSubValuesToDisplay(SoftSubs2(i))
+                    SubType_Value = SubType_Value + SoftSubsList(i).SubLangName
-                    If i < SoftSubs2.Count - 1 Then
+                    If i < SoftSubsList.Count - 1 Then
                         SubType_Value = SubType_Value + ", "
                     End If
                 Next
             End If
+#End Region
+
+#Region "Display Resolution"
+
 
             Dim ResoHTMLDisplay As String = Nothing
             Dim ResoHTML As String() = ResoUsed.Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries)
@@ -1854,18 +1826,17 @@ Public Class Main
             If Reso = 42 And HybridMode = False Then
                 ResoHTMLDisplay = "[Auto]"
             End If
+#End Region
+
 
-            Pfad_DL = Pfad2
             Dim L1Name_Split As String() = WebsiteURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
             Dim L1Name As String = L1Name_Split(1).Replace("www.", "") + " | Dub : " + HardSubValuesToDisplay(CR_audio_locale)
-            If SubsOnly = True Then
-                URL_DL = "-i [Subtitles only]"
-            End If
 
+            'MsgBox(URL_DL)
 
 
             Me.Invoke(New Action(Function() As Object
-                                     ListItemAdd(Path.GetFileName(Pfad_DL.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, SubType_Value, thumbnail3, URL_DL, Pfad_DL)
+                                     ListItemAdd(Path.GetFileName(Pfad2.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, SubType_Value, thumbnail3, ffmpegInput, Pfad2)
                                      Return Nothing
                                  End Function))
             'liList.Add(My.Resources.htmlvorThumbnail + thumbnail3 + My.Resources.htmlnachTumbnail + CR_title + " <br> " + CR_season_number + " " + CR_episode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + Subsprache3 + My.Resources.htmlnachHardSubs + "<!-- " + L2Name + "-->")
@@ -1933,41 +1904,7 @@ Public Class Main
             Return Nothing
         End Try
     End Function
-    'Function ConvertCC(ByVal CC As String) As String
+
-    '    Try
-    '        If CC = "deDE" Then
-    '            Return "de-DE"
-    '        ElseIf CC = "enUS" Then
-    '            Return "en-US"
-    '        ElseIf CC = "ptBR" Then
-    '            Return "pt-BR"
-    '        ElseIf CC = "esLA" Then
-    '            Return "es-LA"
-    '        ElseIf CC = "es-419" Then
-    '            Return "es-419"
-    '        ElseIf CC = "frFR" Then
-    '            Return "fr-FR"
-    '        ElseIf CC = "arME" Then
-    '            Return "ar-ME"
-    '        ElseIf CC = "ar-SA" Then
-    '            Return "ar-SA"
-    '        ElseIf CC = "ruRU" Then
-    '            Return "ru-RU"
-    '        ElseIf CC = "itIT" Then
-    '            Return "it-IT"
-    '        ElseIf CC = "esES" Then
-    '            Return "es-ES"
-    '        ElseIf CC = "jaJP" Then
-    '            Return "ja-JP"
-    '        ElseIf CC = "None" Then
-    '            Return ""
-    '        Else
-    '            Return CB_SuB_Nothing
-    '        End If
-    '    Catch ex As Exception
-    '        Return Nothing
-    '    End Try
-    'End Function
 #End Region
 
     Private Sub Btn_Close_Click(sender As Object, e As EventArgs) Handles Btn_Close.Click
@@ -3236,7 +3173,7 @@ Public Class Main
             Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
             Dim L1Name As String = L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub
             Me.Invoke(New Action(Function() As Object
-                                     ListItemAdd(Pfad_DL, L1Name, DefaultName, ResoHTMLDisplay, Funimation_m3u8_MainVersion, thumbnail4, Funimation_m3u8_final, DownloadPfad, "FM")
+                                     ListItemAdd(DownloadPfad, L1Name, DefaultName, ResoHTMLDisplay, Funimation_m3u8_MainVersion, thumbnail4, Funimation_m3u8_final, DownloadPfad, "FM")
                                      Return Nothing
                                  End Function))
             'liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + FunimationTitle + " <br> " + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + DefaultName + "-->")
@@ -4281,13 +4218,13 @@ Public Class Main
 
     Sub FillArray() '
 
-        SubSpracheEnum.Add(New NameValuePair("[ null ]", "None", Nothing))
+        SubSpracheEnum.Add(New NameValuePair("[ null ]", Nothing, Nothing))
         SubSpracheEnum.Add(New NameValuePair("Deutsch", "de-DE", Nothing))
         SubSpracheEnum.Add(New NameValuePair("English", "en-US", "en"))
         SubSpracheEnum.Add(New NameValuePair("Português (Brasil)", "pt-BR", "pt"))
         SubSpracheEnum.Add(New NameValuePair("Español (LA)", "es-419", "es"))
         SubSpracheEnum.Add(New NameValuePair("Français (France)", "fr-FR", Nothing))
-        SubSpracheEnum.Add(New NameValuePair("العربية (Arabic)", "ar-ME", Nothing))
+        SubSpracheEnum.Add(New NameValuePair("العربية (Arabic)", "ar-SA", Nothing))
         SubSpracheEnum.Add(New NameValuePair("Русский (Russian)", "ru-RU", Nothing))
         SubSpracheEnum.Add(New NameValuePair("Italiano (Italian)", "it-IT", Nothing))
         SubSpracheEnum.Add(New NameValuePair("Español (España)", "es-ES", Nothing))

Crunchyroll Downloader/einstellungen.Designer.vb

@@ -54,15 +54,15 @@ Partial Class Einstellungen
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
         Me.FFMPEG_CommandP1 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.copy = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.nv_h264 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC3 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.nv_hevc = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC4 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.CPU_h264 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC5 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.CPU_h265 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC6 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AMD_h264 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC7 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.AMD_hevc = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC8 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.Intel_h264 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListC9 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.Intel_hevc = New System.Windows.Forms.ToolStripMenuItem()
         Me.FFMPEG_CommandP2 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ListP1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ListP2 = New System.Windows.Forms.ToolStripMenuItem()
@@ -154,6 +154,9 @@ Partial Class Einstellungen
         Me.Label5 = New MetroFramework.Controls.MetroLabel()
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
         Me.Btn_Save = New System.Windows.Forms.Button()
+        Me.Intel_AV1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.CPU_AV1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.nv_AV1 = New System.Windows.Forms.ToolStripMenuItem()
         CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox14.SuspendLayout()
         Me.SoftSubs.SuspendLayout()
@@ -406,10 +409,10 @@ Partial Class Einstellungen
         Me.TabPage2.HorizontalScrollbarBarColor = True
         Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False
         Me.TabPage2.HorizontalScrollbarSize = 10
-        Me.TabPage2.Location = New System.Drawing.Point(4, 35)
+        Me.TabPage2.Location = New System.Drawing.Point(4, 44)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(501, 528)
+        Me.TabPage2.Size = New System.Drawing.Size(501, 519)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Output"
         Me.TabPage2.VerticalScrollbarBarColor = True
@@ -590,65 +593,73 @@ 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.ListC8, Me.ListC9})
+        Me.FFMPEG_CommandP1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.copy, Me.CPU_h264, Me.CPU_h265, Me.CPU_AV1, Me.nv_h264, Me.nv_hevc, Me.nv_AV1, Me.AMD_h264, Me.AMD_hevc, Me.Intel_h264, Me.Intel_hevc, Me.Intel_AV1})
         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)
         Me.FFMPEG_CommandP1.Text = "-c copy"
         '
-        'ListC1
+        'copy
         '
-        Me.ListC1.Name = "ListC1"
+        Me.copy.Name = "copy"
-        Me.ListC1.Size = New System.Drawing.Size(172, 22)
+        Me.copy.Size = New System.Drawing.Size(180, 22)
-        Me.ListC1.Text = "-c copy"
+        Me.copy.Text = "-c copy"
         '
-        'ListC2
+        'nv_h264
         '
-        Me.ListC2.Name = "ListC2"
+        Me.nv_h264.BackColor = System.Drawing.Color.YellowGreen
-        Me.ListC2.Size = New System.Drawing.Size(172, 22)
+        Me.nv_h264.Name = "nv_h264"
-        Me.ListC2.Text = "-c:v h264_nvenc "
+        Me.nv_h264.Size = New System.Drawing.Size(180, 22)
+        Me.nv_h264.Text = "-c:v h264_nvenc "
         '
-        'ListC3
+        'nv_hevc
         '
-        Me.ListC3.Name = "ListC3"
+        Me.nv_hevc.BackColor = System.Drawing.Color.YellowGreen
-        Me.ListC3.Size = New System.Drawing.Size(172, 22)
+        Me.nv_hevc.Name = "nv_hevc"
-        Me.ListC3.Text = "-c:v hevc_nvenc"
+        Me.nv_hevc.Size = New System.Drawing.Size(180, 22)
+        Me.nv_hevc.Text = "-c:v hevc_nvenc"
         '
-        'ListC4
+        'CPU_h264
         '
-        Me.ListC4.Name = "ListC4"
+        Me.CPU_h264.BackColor = System.Drawing.Color.DarkGray
-        Me.ListC4.Size = New System.Drawing.Size(172, 22)
+        Me.CPU_h264.Name = "CPU_h264"
-        Me.ListC4.Text = "-c:v libx264"
+        Me.CPU_h264.Size = New System.Drawing.Size(180, 22)
+        Me.CPU_h264.Text = "-c:v libx264"
         '
-        'ListC5
+        'CPU_h265
         '
-        Me.ListC5.Name = "ListC5"
+        Me.CPU_h265.BackColor = System.Drawing.Color.DarkGray
-        Me.ListC5.Size = New System.Drawing.Size(172, 22)
+        Me.CPU_h265.Name = "CPU_h265"
-        Me.ListC5.Text = "-c:v libx265"
+        Me.CPU_h265.Size = New System.Drawing.Size(180, 22)
+        Me.CPU_h265.Text = "-c:v libx265"
         '
-        'ListC6
+        'AMD_h264
         '
-        Me.ListC6.Name = "ListC6"
+        Me.AMD_h264.BackColor = System.Drawing.Color.Tomato
-        Me.ListC6.Size = New System.Drawing.Size(172, 22)
+        Me.AMD_h264.Name = "AMD_h264"
-        Me.ListC6.Text = "-c:v h264_amf"
+        Me.AMD_h264.Size = New System.Drawing.Size(180, 22)
+        Me.AMD_h264.Text = "-c:v h264_amf"
         '
-        'ListC7
+        'AMD_hevc
         '
-        Me.ListC7.Name = "ListC7"
+        Me.AMD_hevc.BackColor = System.Drawing.Color.Tomato
-        Me.ListC7.Size = New System.Drawing.Size(172, 22)
+        Me.AMD_hevc.Name = "AMD_hevc"
-        Me.ListC7.Text = "-c:v hevc_amf"
+        Me.AMD_hevc.Size = New System.Drawing.Size(180, 22)
+        Me.AMD_hevc.Text = "-c:v hevc_amf"
         '
-        'ListC8
+        'Intel_h264
         '
-        Me.ListC8.Name = "ListC8"
+        Me.Intel_h264.BackColor = System.Drawing.Color.CornflowerBlue
-        Me.ListC8.Size = New System.Drawing.Size(172, 22)
+        Me.Intel_h264.Name = "Intel_h264"
-        Me.ListC8.Text = "-c:v h264_qsv"
+        Me.Intel_h264.Size = New System.Drawing.Size(180, 22)
+        Me.Intel_h264.Text = "-c:v h264_qsv"
         '
-        'ListC9
+        'Intel_hevc
         '
-        Me.ListC9.Name = "ListC9"
+        Me.Intel_hevc.BackColor = System.Drawing.Color.CornflowerBlue
-        Me.ListC9.Size = New System.Drawing.Size(172, 22)
+        Me.Intel_hevc.Name = "Intel_hevc"
-        Me.ListC9.Text = "-c:v hevc_qsv"
+        Me.Intel_hevc.Size = New System.Drawing.Size(180, 22)
+        Me.Intel_hevc.Text = "-c:v hevc_qsv"
         '
         'FFMPEG_CommandP2
         '
@@ -1123,7 +1134,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 = 3
+        Me.TabControl1.SelectedIndex = 1
         Me.TabControl1.Size = New System.Drawing.Size(509, 567)
         Me.TabControl1.TabIndex = 0
         Me.TabControl1.UseSelectable = True
@@ -1137,9 +1148,9 @@ Partial Class Einstellungen
         Me.MetroTabPage2.HorizontalScrollbarBarColor = True
         Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False
         Me.MetroTabPage2.HorizontalScrollbarSize = 10
-        Me.MetroTabPage2.Location = New System.Drawing.Point(4, 35)
+        Me.MetroTabPage2.Location = New System.Drawing.Point(4, 44)
         Me.MetroTabPage2.Name = "MetroTabPage2"
-        Me.MetroTabPage2.Size = New System.Drawing.Size(501, 528)
+        Me.MetroTabPage2.Size = New System.Drawing.Size(501, 519)
         Me.MetroTabPage2.TabIndex = 8
         Me.MetroTabPage2.Text = "Naming"
         Me.MetroTabPage2.VerticalScrollbarBarColor = True
@@ -1774,6 +1785,27 @@ Partial Class Einstellungen
         Me.Btn_Save.TabIndex = 9
         Me.Btn_Save.UseVisualStyleBackColor = False
         '
+        'Intel_AV1
+        '
+        Me.Intel_AV1.BackColor = System.Drawing.Color.CornflowerBlue
+        Me.Intel_AV1.Name = "Intel_AV1"
+        Me.Intel_AV1.Size = New System.Drawing.Size(180, 22)
+        Me.Intel_AV1.Text = "-c:v av1_qsv"
+        '
+        'CPU_AV1
+        '
+        Me.CPU_AV1.BackColor = System.Drawing.Color.DarkGray
+        Me.CPU_AV1.Name = "CPU_AV1"
+        Me.CPU_AV1.Size = New System.Drawing.Size(180, 22)
+        Me.CPU_AV1.Text = "-c:v libsvtav1"
+        '
+        'nv_AV1
+        '
+        Me.nv_AV1.BackColor = System.Drawing.Color.YellowGreen
+        Me.nv_AV1.Name = "nv_AV1"
+        Me.nv_AV1.Size = New System.Drawing.Size(180, 22)
+        Me.nv_AV1.Text = "-c:v av1_nvenc"
+        '
         'Einstellungen
         '
         Me.ApplyImageInvert = True
@@ -1853,11 +1885,11 @@ Partial Class Einstellungen
     Friend WithEvents Panel1 As Panel
     Friend WithEvents MenuStrip1 As MenuStrip
     Friend WithEvents FFMPEG_CommandP1 As ToolStripMenuItem
-    Friend WithEvents ListC1 As ToolStripMenuItem
+    Friend WithEvents copy As ToolStripMenuItem
-    Friend WithEvents ListC2 As ToolStripMenuItem
+    Friend WithEvents nv_h264 As ToolStripMenuItem
-    Friend WithEvents ListC3 As ToolStripMenuItem
+    Friend WithEvents nv_hevc As ToolStripMenuItem
-    Friend WithEvents ListC4 As ToolStripMenuItem
+    Friend WithEvents CPU_h264 As ToolStripMenuItem
-    Friend WithEvents ListC5 As ToolStripMenuItem
+    Friend WithEvents CPU_h265 As ToolStripMenuItem
     Friend WithEvents FFMPEG_CommandP2 As ToolStripMenuItem
     Friend WithEvents ListP1 As ToolStripMenuItem
     Friend WithEvents ListP2 As ToolStripMenuItem
@@ -1935,8 +1967,8 @@ Partial Class Einstellungen
     Friend WithEvents CR_SoftSubDefault As MetroFramework.Controls.MetroComboBox
     Friend WithEvents CB_Format As MetroFramework.Controls.MetroComboBox
     Friend WithEvents MetroTabPage1 As MetroFramework.Controls.MetroTabPage
-    Friend WithEvents ListC6 As ToolStripMenuItem
+    Friend WithEvents AMD_h264 As ToolStripMenuItem
-    Friend WithEvents ListC7 As ToolStripMenuItem
+    Friend WithEvents AMD_hevc As ToolStripMenuItem
     Friend WithEvents ListP3 As ToolStripMenuItem
     Friend WithEvents Btn_Save As Button
     Friend WithEvents MetroLabel2 As MetroFramework.Controls.MetroLabel
@@ -1970,12 +2002,15 @@ 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 Intel_h264 As ToolStripMenuItem
-    Friend WithEvents ListC9 As ToolStripMenuItem
+    Friend WithEvents Intel_hevc As ToolStripMenuItem
     Friend WithEvents GroupBox19 As GroupBox
     Friend WithEvents DubMode As MetroFramework.Controls.MetroCheckBox
     Friend WithEvents CB_Merge As MetroFramework.Controls.MetroComboBox
     Friend WithEvents GroupBox20 As GroupBox
     Friend WithEvents ChB_Chapters As MetroFramework.Controls.MetroCheckBox
     Friend WithEvents Chb_Ign_tls As MetroFramework.Controls.MetroCheckBox
+    Friend WithEvents Intel_AV1 As ToolStripMenuItem
+    Friend WithEvents CPU_AV1 As ToolStripMenuItem
+    Friend WithEvents nv_AV1 As ToolStripMenuItem
 End Class

Crunchyroll Downloader/einstellungen.resx

@@ -126,9 +126,6 @@
   <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>118, 20</value>
   </metadata>
-  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>118, 20</value>
-  </metadata>
   <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>332, 20</value>
   </metadata>

Crunchyroll Downloader/einstellungen.vb

@@ -90,7 +90,7 @@ Public Class Einstellungen
                 CBesLA.Checked = True
             ElseIf Main.SoftSubs(i) = "fr-FR" Then
                 CBfrFR.Checked = True
-            ElseIf Main.SoftSubs(i) = "ar-ME" Then
+            ElseIf Main.SoftSubs(i) = "ar-SA" Then
                 CBarME.Checked = True
             ElseIf Main.SoftSubs(i) = "ru-RU" Then
                 CBruRU.Checked = True
@@ -223,6 +223,7 @@ Public Class Einstellungen
                 'MsgBox(CB_CR_Harsubs.Items.Count.ToString)
                 'MsgBox(i.ToString)
                 CB_CR_Harsubs.SelectedIndex = i
+                'Exit For
             End If
 
         Next
@@ -275,6 +276,10 @@ Public Class Einstellungen
             FFMPEG_CommandP4.Text = "-c:a copy -bsf:a aac_adtstoasc"
         End If
 
+        If FFMPEG_CommandP1.Text = "-c:v libsvtav1" And FFMPEG_CommandP2.Text = "[no Preset]" Then
+            FFMPEG_CommandP2.Enabled = False
+            FFMPEG_CommandP3.Enabled = True
+        End If
 
 
         ListViewAdd_True.Checked = Main.UseQueue
@@ -311,7 +316,7 @@ Public Class Einstellungen
             CR_SoftSubDefault.SelectedItem = "Español (LA)"
         ElseIf Main.DefaultSubCR = "fr-FR" Then
             CR_SoftSubDefault.SelectedItem = "Français (France)"
-        ElseIf Main.DefaultSubCR = "ar-ME" Then
+        ElseIf Main.DefaultSubCR = "ar-SA" Then
             CR_SoftSubDefault.SelectedItem = "العربية (Arabic)"
         ElseIf Main.DefaultSubCR = "ru-RU" Then
             CR_SoftSubDefault.SelectedItem = "Русский (Russian)"
@@ -451,39 +456,39 @@ Public Class Einstellungen
 
 
         If CR_SoftSubDefault.SelectedItem.ToString = "English" Then
-                Main.DefaultSubCR = "en-US"
+            Main.DefaultSubCR = "en-US"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Deutsch" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Deutsch" Then
-                Main.DefaultSubCR = "de-DE"
+            Main.DefaultSubCR = "de-DE"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Português (Brasil)" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Português (Brasil)" Then
-                Main.DefaultSubCR = "pt-BR"
+            Main.DefaultSubCR = "pt-BR"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Español (LA)" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Español (LA)" Then
-                Main.DefaultSubCR = "es-419"
+            Main.DefaultSubCR = "es-419"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Français (France)" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Français (France)" Then
-                Main.DefaultSubCR = "fr-FR"
+            Main.DefaultSubCR = "fr-FR"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "العربية (Arabic)" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "العربية (Arabic)" Then
-                Main.DefaultSubCR = "ar-ME"
+            Main.DefaultSubCR = "ar-SA"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Русский (Russian)" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Русский (Russian)" Then
-                Main.DefaultSubCR = "ru-RU"
+            Main.DefaultSubCR = "ru-RU"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Italiano (Italian)" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Italiano (Italian)" Then
-                Main.DefaultSubCR = "it-IT"
+            Main.DefaultSubCR = "it-IT"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Español (España)" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "Español (España)" Then
-                Main.DefaultSubCR = "es-ES"
+            Main.DefaultSubCR = "es-ES"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            ElseIf CR_SoftSubDefault.SelectedItem.ToString = "[Disabled]" Then
+        ElseIf CR_SoftSubDefault.SelectedItem.ToString = "[Disabled]" Then
-                Main.DefaultSubCR = "None"
+            Main.DefaultSubCR = "None"
-                My.Settings.DefaultSubCR = Main.DefaultSubCR
+            My.Settings.DefaultSubCR = Main.DefaultSubCR
-            End If
+        End If
 
 
-            If CR_Filename.Text = "[episode number]" Then
+        If CR_Filename.Text = "[episode number]" Then
             Main.CR_NameMethode = 0
             My.Settings.CR_NameMethode = Main.CR_NameMethode
         ElseIf CR_Filename.Text = "[episode name]" Then
@@ -680,33 +685,31 @@ Public Class Einstellungen
 #Region "sof subs"
         Main.SoftSubs.Clear()
         If CBdeDE.Checked = True Then
-            Main.SoftSubs.Add("deDE")
+            Main.SoftSubs.Add("de-DE")
         End If
         If CBenUS.Checked = True Then
-            Main.SoftSubs.Add("enUS")
+            Main.SoftSubs.Add("en-US")
         End If
         If CBptBR.Checked = True Then
-            Main.SoftSubs.Add("ptBR")
+            Main.SoftSubs.Add("pt-BR")
         End If
         If CBesLA.Checked = True Then
-            Main.SoftSubs.Add("esLA")
             Main.SoftSubs.Add("es-419")
         End If
         If CBfrFR.Checked = True Then
-            Main.SoftSubs.Add("frFR")
+            Main.SoftSubs.Add("fr-FR")
         End If
         If CBarME.Checked = True Then
-            Main.SoftSubs.Add("arME")
             Main.SoftSubs.Add("ar-SA")
         End If
         If CBruRU.Checked = True Then
-            Main.SoftSubs.Add("ruRU")
+            Main.SoftSubs.Add("ru-RU")
         End If
         If CBitIT.Checked = True Then
-            Main.SoftSubs.Add("itIT")
+            Main.SoftSubs.Add("it-IT")
         End If
         If CBesES.Checked = True Then
-            Main.SoftSubs.Add("esES")
+            Main.SoftSubs.Add("es-ES")
         End If
 
         Dim SaveString As String = Nothing
@@ -839,12 +842,17 @@ Public Class Einstellungen
 
 
 
-    Private Sub ListC1_Click(sender As Object, e As EventArgs) Handles ListC1.Click, ListC2.Click, ListC3.Click, ListC4.Click, ListC5.Click, ListC6.Click, ListC7.Click, ListC8.Click, ListC9.Click
+    Private Sub ListC1_Click(sender As Object, e As EventArgs) Handles copy.Click, nv_h264.Click, nv_hevc.Click, nv_AV1.Click, CPU_h264.Click, CPU_h265.Click, CPU_AV1.Click, AMD_h264.Click, AMD_hevc.Click, Intel_h264.Click, Intel_hevc.Click, Intel_AV1.Click
         Dim Button As ToolStripMenuItem = CType(sender, ToolStripMenuItem)
         If Button.Text = "-c copy" Then
             FFMPEG_CommandP1.Text = "-c copy"
             FFMPEG_CommandP2.Enabled = False
             FFMPEG_CommandP3.Enabled = False
+        ElseIf Button.Text = "-c:v libsvtav1" Then
+            FFMPEG_CommandP1.Text = Button.Text
+            FFMPEG_CommandP2.Text = "[no Preset]"
+            FFMPEG_CommandP2.Enabled = False
+            FFMPEG_CommandP3.Enabled = True
         Else
             FFMPEG_CommandP1.Text = Button.Text
             FFMPEG_CommandP2.Enabled = True
@@ -914,6 +922,7 @@ Public Class Einstellungen
         GroupBox17.ForeColor = color
         GroupBox18.ForeColor = color
         GroupBox19.ForeColor = color
+        GroupBox20.ForeColor = color
     End Sub