GithubStar/staxrip
1
0
Fork 0
mirror of https://github.com/staxrip/staxrip.git synced 2026-10-29 06:06:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

aomenc dropdown controls have a properly expanded width

Browse Source
This commit is contained in:
Frank Skare
2020-12-19 23:29:59 +01:00
parent ef1a952300
commit 4e79fe3441
7 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changelog.md
+1
View File
@@ -6,6 +6,7 @@
- aomenc options reorganized, restructured and refreshed (Dendraspis, Neltulz, [#375](/../../issues/375))
- Removed 'HDRCore-ToneMapping' because of use of DGTonemap (Dendraspis, JJKylee, 44vince44, [#369](/../../issues/369))
- aomenc options optimized (Dendraspis, Neltulz, BlueSwordM , [#361](/../../issues/361))
- aomenc dropdown controls have a properly expanded width. (stax76)
- Fix rightclick on aomenc options doesn't show help (Dendraspis, [#365](/../../issues/365))
- Expand 'Restore Profiles' to preserve possible custom profiles (Dendraspis)
- Fix bug in ListBoxEx with selection after removing items (Dendraspis)
Encoding/NVEnc.vb
+1 -2
View File
@@ -157,7 +157,6 @@ Public Class NVEnc
Property Mode As New OptionParam With {
.Text = "Mode",
.Expand = True,
.Switches = {"--cqp", "--cbr", "--cbrhq", "--vbr", "--vbrhq"},
.Options = {"CQP - Constant QP",
"CBR - Constant Bitrate",
@@ -436,7 +435,7 @@ Public Class NVEnc
New BoolParam With {.Switch = "--weightp", .Text = "Enable weighted prediction in P slices"})
Add("Performance",
New StringParam With {.Switch = "--perf-monitor", .Text = "Perf. Monitor"},
New OptionParam With {.Switch = "--cuda-schedule", .Text = "Cuda Schedule", .Expand = True, .Init = 3, .Options = {"Let cuda driver to decide", "CPU will spin when waiting GPU tasks", "CPU will yield when waiting GPU tasks", "CPU will sleep when waiting GPU tasks"}, .Values = {"auto", "spin", "yield", "sync"}},
New OptionParam With {.Switch = "--cuda-schedule", .Text = "Cuda Schedule", .Init = 3, .Options = {"Let cuda driver to decide", "CPU will spin when waiting GPU tasks", "CPU will yield when waiting GPU tasks", "CPU will sleep when waiting GPU tasks"}, .Values = {"auto", "spin", "yield", "sync"}},
New OptionParam With {.Switch = "--output-buf", .Text = "Output Buffer", .Options = {"8", "16", "32", "64", "128"}},
New OptionParam With {.Switch = "--output-thread", .Text = "Output Thread", .Options = {"Automatic", "Disabled", "One Thread"}, .Values = {"-1", "0", "1"}},
New NumParam With {.Switch = "--perf-monitor-interval", .Init = 500, .Config = {50, Integer.MaxValue}, .Text = "Perf. Mon. Interval"},
Encoding/QSVEnc.vb
-1
View File
@@ -165,7 +165,6 @@ Public Class QSVEnc
.Switches = {"--avbr", "--cbr", "--vbr", "--qvbr-q", "--cqp", "--icq", "--la-icq", "--vcm", "--la", "--la-hrd", "--qvbr"},
.Name = "Mode",
.Text = "Mode",
.Expand = True,
.Options = {"AVBR - Average Variable Bitrate", "CBR - Constant Bitrate", "CQP - Constant QP", "ICQ - Intelligent Constant Quality", "LA - VBR Lookahead", "LA-HRD - VBR HRD Lookahead", "LA-ICQ - Intelligent Constant Quality Lookahead", "QVBR - Quality Variable Bitrate using bitrate", "QVBR-Q - Quality Variable Bitrate using quality", "VBR - Variable Bitrate", "VCM - Video Conferencing Mode"},
.Values = {"avbr", "cbr", "cqp", "icq", "la", "la-hrd", "la-icq", "qvbr", "qvbr-q", "vbr", "vcm"},
.Init = 2}
Encoding/x264Enc.vb
-5
View File
@@ -335,7 +335,6 @@ Public Class x264Params
.Switch = "--aq-mode",
.Text = "AQ Mode",
.IntegerValue = True,
.Expand = True,
.Options = {"Disabled", "Variance AQ", "Auto-variance AQ", "Auto-variance AQ with bias to dark scenes"}}
Property BAdapt As New OptionParam With {
@@ -351,7 +350,6 @@ Public Class x264Params
Property Weightp As New OptionParam With {
.Switch = "--weightp",
.Text = "Weight P Prediction",
.Expand = True,
.Options = {"Disabled", "Weighted refs", "Weighted refs + Duplicates"},
.IntegerValue = True}
@@ -420,13 +418,11 @@ Public Class x264Params
.Switches = {"-m"},
.Text = "Subpel Refinement",
.IntegerValue = True,
.Expand = True,
.Options = {"Fullpel only (not recommended)", "SAD mode decision, one qpel iteration", "SATD mode decision", "Progressively more qpel", "Progressively more qpel", "Progressively more qpel", "RD mode decision for I/P-frames", "RD mode decision for all frames", "RD refinement for I/P-frames", "RD refinement for all frames", "QP-RD - requires trellis=2, aq-mode>0", "Full RD disable all early terminations"}}
Property Me_ As New OptionParam With {
.Switch = "--me",
.Text = "Motion Search Method",
.Expand = True,
.Values = {"dia", "hex", "umh", "esa", "tesa"},
.Options = {"Diamond Search, Radius 1 (fast)", "Hexagonal Search, Radius 2", "Uneven Multi-Hexagon Search", "Exhaustive Search", "Hadamard Exhaustive Search (slow)"}}
@@ -438,7 +434,6 @@ Public Class x264Params
.Switch = "--trellis",
.Switches = {"-t"},
.Text = "Trellis",
.Expand = True,
.IntegerValue = True,
.Options = {"Disabled", "Enabled only on the final encode of a MB", "Enabled on all mode decisions"}}
Encoding/x265Enc.vb
+4 -8
View File
@@ -404,7 +404,6 @@ Public Class x265Params
.Switches = {"-m"},
.Text = "Subpel Refinement",
.IntegerValue = True,
.Expand = True,
.Options = {"0 - HPEL 1/4 - QPEL 0/4 - HPEL SATD false",
"1 - HPEL 1/4 - QPEL 1/4 - HPEL SATD false",
"2 - HPEL 1/4 - QPEL 1/4 - HPEL SATD true",
@@ -466,7 +465,6 @@ Public Class x265Params
Property AQmode As New OptionParam With {
.Switch = "--aq-mode",
.Text = "AQ Mode",
.Expand = True,
.IntegerValue = True,
.Options = {"Disabled", "AQ", "AQ Auto-variance", "AQ Auto-variance with bias to dark scenes", "AQ Auto-variance and edge information"}}
@@ -485,7 +483,6 @@ Public Class x265Params
.Switch = "--rd",
.Text = "RD",
.IntegerValue = True,
.Expand = True,
.Options = {"0 - SA8D mode and split decisions, intra w/ source pixels",
"1 - Recon generated (better intra), RDO merge/skip selection",
"2 - RDO splits and merge/skip selection",
@@ -903,7 +900,6 @@ Public Class x265Params
Property RSkip As New OptionParam With {
.Switch = "--rskip",
.Text = "Recursion Skip",
.Expand = True,
.Options = {"0 - Disabled", "1 - RD Level 0-4 Neighbour costs and CU homogenity, RD Level 5-6 Comparison with inter2Nx2N", "2 - RD Level 0-6 CU edge denstiy"},
.Values = {"0", "1", "2"},
.Init = 1}
@@ -922,9 +918,9 @@ Public Class x265Params
Add("Analysis", RD,
New StringParam With {.Switch = "--analysis-reuse-file", .Text = "Analysis Reuse File", .BrowseFile = True},
New StringParam With {.Switch = "--analysis-save", .Text = "Analysis Save", .BrowseFile = True},
New OptionParam With {.Switch = "--analysis-save-reuse-level", .Text = "Save Reuse Level", .Expand = True, .IntegerValue = True, .Options = {" 0 - Default", " 1 - Lookahead information", " 2 - Level 1 + intra/inter modes, ref's", " 3 - Level 1 + intra/inter modes, ref's", " 4 - Level 1 + intra/inter modes, ref's", " 5 - Level 2 + rect-amp", " 6 - Level 2 + rect-amp", " 7 - Level 5 + AVC size CU refinement", " 8 - Level 5 + AVC size Full CU analysis-info", " 9 - Level 5 + AVC size Full CU analysis-info", "10 - Level 5 + Full CU analysis-info"}},
New OptionParam With {.Switch = "--analysis-save-reuse-level", .Text = "Save Reuse Level", .IntegerValue = True, .Options = {" 0 - Default", " 1 - Lookahead information", " 2 - Level 1 + intra/inter modes, ref's", " 3 - Level 1 + intra/inter modes, ref's", " 4 - Level 1 + intra/inter modes, ref's", " 5 - Level 2 + rect-amp", " 6 - Level 2 + rect-amp", " 7 - Level 5 + AVC size CU refinement", " 8 - Level 5 + AVC size Full CU analysis-info", " 9 - Level 5 + AVC size Full CU analysis-info", "10 - Level 5 + Full CU analysis-info"}},
New StringParam With {.Switch = "--analysis-load", .Text = "Analysis Load", .BrowseFile = True},
New OptionParam With {.Switch = "--analysis-load-reuse-level", .Text = "Load Reuse Level", .Expand = True, .IntegerValue = True, .Options = {" 0 - Default", " 1 - Lookahead information", " 2 - Level 1 + intra/inter modes, ref's", " 3 - Level 1 + intra/inter modes, ref's", " 4 - Level 1 + intra/inter modes, ref's", " 5 - Level 2 + rect-amp", " 6 - Level 2 + rect-amp", " 7 - Level 5 + AVC size CU refinement", " 8 - Level 5 + AVC size Full CU analysis-info", " 9 - Level 5 + AVC size Full CU analysis-info", "10 - Level 5 + Full CU analysis-info"}},
New OptionParam With {.Switch = "--analysis-load-reuse-level", .Text = "Load Reuse Level", .IntegerValue = True, .Options = {" 0 - Default", " 1 - Lookahead information", " 2 - Level 1 + intra/inter modes, ref's", " 3 - Level 1 + intra/inter modes, ref's", " 4 - Level 1 + intra/inter modes, ref's", " 5 - Level 2 + rect-amp", " 6 - Level 2 + rect-amp", " 7 - Level 5 + AVC size CU refinement", " 8 - Level 5 + AVC size Full CU analysis-info", " 9 - Level 5 + AVC size Full CU analysis-info", "10 - Level 5 + Full CU analysis-info"}},
RSkip,
New NumParam With {.Switch = "--rskip-edge-threshold", .Text = "RSkip Edge Threshold", .Init = 5, .Config = {0, 100}},
MinCuSize, MaxCuSize, MaxTuSize, LimitRefs)
@@ -932,7 +928,7 @@ Public Class x265Params
New NumParam With {.Switch = "--scale-factor", .Text = "Scale Factor"},
LimitTU, TUintra, TUinter, rdoqLevel, PsyRDOQ,
New NumParam With {.Switch = "--dynamic-rd", .Text = "Dynamic RD", .Config = {0, 4}},
New OptionParam With {.Switch = "--refine-mv", .Text = "Refine MV", .Expand = True, .IntegerValue = True, .Options = {"Disabled", "Level 1: Search around scaled MV", "Level 2: Level 1 + Search around best AMVP cand", "Level 3: Level 2 + Search around the other AMVP cand"}},
New OptionParam With {.Switch = "--refine-mv", .Text = "Refine MV", .IntegerValue = True, .Options = {"Disabled", "Level 1: Search around scaled MV", "Level 2: Level 1 + Search around best AMVP cand", "Level 3: Level 2 + Search around the other AMVP cand"}},
New NumParam With {.Switch = "--refine-intra", .Text = "Refine Intra", .Config = {0, 4}},
New NumParam With {.Switch = "--refine-inter", .Text = "Refine Inter", .Config = {0, 3}},
New BoolParam With {.Switch = "--dynamic-refine", .Text = "Dynamic Refine"},
@@ -985,7 +981,7 @@ Public Class x265Params
New BoolParam With {.Switch = "--hme", .NoSwitch = "--no-hme", .Text = "3-level Hierarchical motion estimation"})
Add("Slice Decision",
New StringParam With {.Switch = "--refine-analysis-type", .Text = "Refine Analysis Type"},
New OptionParam() With {.Switch = "--force-flush", .Text = "Force Flush", .Expand = True, .IntegerValue = True, .Options = {"Flush the encoder only when all the input pictures are over", "Flush all the frames even when the input is not over", "Flush the slicetype decided frames only"}},
New OptionParam() With {.Switch = "--force-flush", .Text = "Force Flush", .IntegerValue = True, .Options = {"Flush the encoder only when all the input pictures are over", "Flush all the frames even when the input is not over", "Flush the slicetype decided frames only"}},
BAdapt,
New OptionParam With {.Switch = "--ctu-info", .Text = "CTU Info", .Options = {"0", "1", "2", "4", "6"}},
BFrames, BFrameBias,
Forms/CommandLineForm.vb
+4 -2
View File
@@ -14,7 +14,7 @@ Public Class CommandLineForm
Sub New(params As CommandLineParams)
InitializeComponent()
SimpleUI.ScaleClientSize(37, 26)
SimpleUI.ScaleClientSize(38, 26)
rtbCommandLine.ScrollBars = RichTextBoxScrollBars.None
rtbCommandLine.ContextMenuStrip.Dispose()
@@ -188,7 +188,9 @@ Public Class CommandLineForm
helpControl = menuBlock.Label
AddHandler menuBlock.Label.MouseDoubleClick, Sub() tempOptionParam.ValueChangedUser(tempOptionParam.DefaultValue)
If oParam.Expand Then
Dim max = oParam.Options.Select(Function(txt) txt.Length).Max
If max > 25 Then
menuBlock.Button.Expand = True
End If
General/CommandLine.vb
-1
View File
@@ -371,7 +371,6 @@ Namespace CommandLine
Property Options As String()
Property Values As String()
Property Expand As Boolean
Property MenuButton As MenuButton
Property DefaultValue As Integer
Property IntegerValue As Boolean