Skip to content

Commit cbee196

Browse files
Lake1059Lake1059
committed
2025/8/1-1
1 parent 9bc2dfd commit cbee196

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

‎FFmpegFreeUI/FFmpegFreeUI.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PublishSingleFile>True</PublishSingleFile>
1414
<Authors>1059 Studio</Authors>
1515
<Company>1059 Studio</Company>
16-
<Version>1.7</Version>
16+
<Version>1.8</Version>
1717
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
1818
<ApplicationIcon>ico.ico</ApplicationIcon>
1919
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>

‎FFmpegFreeUI/Form1.Designer.vb‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FFmpegFreeUI/Form1.vb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Public Class Form1
2626
UiComboBox字体名称.Text = 用户设置.实例对象.字体
2727
If UiComboBox字体名称.Items.Contains("微软雅黑") Then UiComboBox字体名称.Font = New Font("微软雅黑", UiComboBox字体名称.Font.Size)
2828
SetControlFont(用户设置.实例对象.字体, Me, {UiComboBox字体名称}, True)
29+
Me.ListView1.ContextMenuStrip.Font = New Font(Me.UiComboBox字体名称.Text, Me.ListView1.ContextMenuStrip.Font.Size)
2930
界面控制.界面校准()
3031
If DPI <> 1 Then DPI变动时校准界面()
3132

@@ -222,5 +223,6 @@ Public Class Form1
222223
If Me.UiComboBox3.SelectedIndex < 0 Then Exit Sub
223224
Panel24.Controls.Add(插件管理.由插件加载的自定义界面(Me.UiComboBox3.Text))
224225
插件管理.由插件加载的自定义界面(Me.UiComboBox3.Text).Dock = DockStyle.Fill
226+
SetControlFont(用户设置.实例对象.字体, Panel24)
225227
End Sub
226228
End Class

‎FFmpegFreeUI/视频编码器数据库.vb‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
.Tune = New List(Of String) From {""},
1717
.Pix_fmt = New List(Of String) From {""}
1818
})
19+
1920
字典.Add("libx266", New 视频编码器数据单片结构 With {
2021
.Preset = New List(Of String) From {"veryslow", "slower", "slow", "medium", "fast", "faster", "veryfast", "superfast", "ultrafast"},
2122
.Profile = New List(Of String) From {"main", "main10"},
@@ -26,20 +27,20 @@
2627
.Preset = New List(Of String) From {"slower", "slow", "medium", "fast", "faster", "veryfast", "superfast", "ultrafast"},
2728
.Profile = New List(Of String) From {"main", "main10"},
2829
.Tune = New List(Of String) From {""},
29-
.Pix_fmt = Split("yuv420p10le", " ").ToList
30+
.Pix_fmt = Split("yuv420p yuv420p10le", " ").ToList
3031
})
3132

3233

3334

3435
字典.Add("libaom-av1", New 视频编码器数据单片结构 With {
35-
.Preset = New List(Of String) From {"best", "good", "realtime"},
36+
.Preset = New List(Of String) From {"0", "1", "2", "3", "4", "5", "6", "7", "8"},
3637
.Profile = New List(Of String) From {"0", "1", "2"},
3738
.Tune = New List(Of String) From {"psnr", "ssim", "qmt"},
3839
.Pix_fmt = Split("yuv420p yuv422p yuv444p gbrp yuv420p10le yuv422p10le yuv444p10le yuv420p12le yuv422p12le yuv444p12le gbrp10le gbrp12le gray gray10le gray12le", " ").ToList
3940
})
4041
字典.Add("libsvtav1", New 视频编码器数据单片结构 With {
4142
.Preset = New List(Of String) From {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"},
42-
.Profile = New List(Of String) From {""},
43+
.Profile = New List(Of String) From {"main", "high", "professional"},
4344
.Tune = New List(Of String) From {""},
4445
.Pix_fmt = Split("yuv420p yuv420p10le", " ").ToList
4546
})
@@ -72,25 +73,25 @@
7273

7374
字典.Add("libx265", New 视频编码器数据单片结构 With {
7475
.Preset = New List(Of String) From {"veryslow", "slower", "slow", "medium", "fast", "faster", "veryfast", "superfast", "ultrafast"},
75-
.Profile = New List(Of String) From {"main", "main10", "mainstillpicture"},
76+
.Profile = New List(Of String) From {"main", "mainstillpicture"},
7677
.Tune = New List(Of String) From {"psnr", "ssim", "grain", "fastdecode", "zerolatency", "animation", "stillimage"},
7778
.Pix_fmt = Split("yuv420p yuvj420p yuv422p yuvj422p yuv444p yuvj444p gbrp yuv420p10le yuv422p10le yuv444p10le gbrp10le yuv420p12le yuv422p12le yuv444p12le gbrp12le gray gray10le gray12le yuva420p yuva420p10le", " ").ToList
7879
})
7980
字典.Add("hevc_nvenc", New 视频编码器数据单片结构 With {
8081
.Preset = New List(Of String) From {"p7", "p6", "p5", "p4", "p3", "p2", "p1"},
81-
.Profile = New List(Of String) From {"main", "main10", "rext"},
82+
.Profile = New List(Of String) From {"main", "rext"},
8283
.Tune = New List(Of String) From {"hq", "uhq", "ll", "ull", "lossless"},
8384
.Pix_fmt = Split("yuv420p nv12 p010le yuv444p p016le nv16 p210le p216le yuv444p16le bgr0 bgra rgb0 rgba x2rgb10le x2bgr10le gbrp gbrp16le cuda d3d11", " ").ToList
8485
})
8586
字典.Add("hevc_amf", New 视频编码器数据单片结构 With {
8687
.Preset = New List(Of String) From {"quality", "balanced", "speed"},
87-
.Profile = New List(Of String) From {"main", "main10"},
88-
.Tune = New List(Of String) From {"transcoding", "ultralowlatency", "lowlatency", "webcam", "high_quality", "lowlatency_high_quality"}, '-usage
88+
.Profile = New List(Of String) From {"main"},
89+
.Tune = New List(Of String) From {"transcoding", "ultralowlatency", "lowlatency", "webcam", "high_quality", "lowlatency_high_quality"},
8990
.Pix_fmt = Split("nv12 yuv420p d3d11 dxva2_vld p010le amf bgr0 rgb0 bgra argb rgba x2bgr10le rgbaf16le", " ").ToList
9091
})
9192
字典.Add("hevc_qsv", New 视频编码器数据单片结构 With {
9293
.Preset = New List(Of String) From {"veryslow", "slower", "slow", "medium", "fast", "faster", "veryfast"},
93-
.Profile = New List(Of String) From {"main", "main10", "mainsp", "rext", "scc"},
94+
.Profile = New List(Of String) From {"main", "mainsp", "rext", "scc"},
9495
.Tune = New List(Of String) From {""},
9596
.Pix_fmt = Split("nv12 p010le p012le yuyv422 y210le qsv bgra x2rgb10le vuyx xv30le", " ").ToList
9697
})
@@ -124,7 +125,7 @@
124125
字典.Add("h264_amf", New 视频编码器数据单片结构 With {
125126
.Preset = New List(Of String) From {"quality", "balanced", "speed"},
126127
.Profile = New List(Of String) From {"main", "high", "constrained_baseline", "constrained_high"},
127-
.Tune = New List(Of String) From {"transcoding", "ultralowlatency", "lowlatency", "webcam", "high_quality", "lowlatency_high_quality"}, '-usage
128+
.Tune = New List(Of String) From {"transcoding", "ultralowlatency", "lowlatency", "webcam", "high_quality", "lowlatency_high_quality"},
128129
.Pix_fmt = Split("nv12 yuv420p d3d11 dxva2_vld p010le amf bgr0 rgb0 bgra argb rgba x2bgr10le rgbaf16le", " ").ToList
129130
})
130131
字典.Add("h264_qsv", New 视频编码器数据单片结构 With {
@@ -167,7 +168,7 @@
167168

168169

169170
字典.Add("libvpx-vp9", New 视频编码器数据单片结构 With {
170-
.Preset = New List(Of String) From {"best", "good", "realtime"}, '-deadline
171+
.Preset = New List(Of String) From {"0", "1", "2", "3", "4", "5"},
171172
.Profile = New List(Of String) From {""},
172173
.Tune = New List(Of String) From {"psnr", "ssim"},
173174
.Pix_fmt = Split("yuv420p yuva420p yuv422p yuv440p yuv444p yuv420p10le yuv422p10le yuv440p10le yuv444p10le yuv420p12le yuv422p12le yuv440p12le yuv444p12le gbrp gbrp10le gbrp12le", " ").ToList

‎FFmpegFreeUI/预设管理.vb‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,14 @@ Public Class 预设管理
552552

553553
If a.视频参数_编码器_类别 = "禁用" Then 视频参数 &= $"-vn "
554554
If a.视频参数_编码器_具体编码 <> "" Then 视频参数 &= $"-c:v {a.视频参数_编码器_具体编码} "
555-
If a.视频参数_编码器_质量 <> "" Then 视频参数 &= $"-preset {a.视频参数_编码器_质量} "
555+
If a.视频参数_编码器_质量 <> "" Then
556+
Select Case a.视频参数_编码器_具体编码
557+
Case "libaom-av1", "libvpx-vp9"
558+
视频参数 &= $"-cpu-used {a.视频参数_编码器_质量} "
559+
Case Else
560+
视频参数 &= $"-preset {a.视频参数_编码器_质量} "
561+
End Select
562+
End If
556563
If a.视频参数_编码器_配置文件 <> "" Then 视频参数 &= $"-profile {a.视频参数_编码器_配置文件} "
557564
If a.视频参数_编码器_场景优化 <> "" Then
558565
Select Case a.视频参数_编码器_具体编码

0 commit comments

Comments
 (0)