diff --git a/Encoding/VideoEncoder.vb b/Encoding/VideoEncoder.vb index bd8e2fb9..df21d8dd 100644 --- a/Encoding/VideoEncoder.vb +++ b/Encoding/VideoEncoder.vb @@ -314,41 +314,27 @@ Public MustInherit Class VideoEncoder ret.Add(New Rav1e) - - 'StaxRip Based on Users Hardware, In Progress - 'Dim IntelCheck = ProcessHelp.GetStdOut(Package.QSVEnc.Path, "--check-hw") - 'Dim Intelmatch = Regex.Match(IntelCheck, "Error") - 'If Intelmatch.Success Then - 'Else - ret.Add(New QSVEnc()) - Dim intel265 As New QSVEnc() - intel265.Params.Codec.Value = 1 - ret.Add(intel265) - 'End If - - 'Dim NvidiaCheck = ProcessHelp.GetStdOut(Package.NVEnc.Path, "--check-features") - 'Dim Nvidiamatch = Regex.Match(NvidiaCheck, "Error") - 'If Nvidiamatch.Success Then - 'Else Dim nvidia264 As New NVEnc() ret.Add(nvidia264) Dim nvidia265 As New NVEnc() nvidia265.Params.Codec.Value = 1 ret.Add(nvidia265) - 'End If - 'Dim AmdCheck = ProcessHelp.GetStdOut(Package.VCEEnc.Path, "--check-features") - 'Dim Amdmatch = Regex.Match(AmdCheck, "failed to initialize AMF") - 'If Amdmatch.Success Then - 'Else + ret.Add(New QSVEnc()) + + Dim intel265 As New QSVEnc() + intel265.Params.Codec.Value = 1 + ret.Add(intel265) + ret.Add(New VCEEnc()) + Dim amd265 As New VCEEnc() amd265.Params.Codec.Value = 1 ret.Add(amd265) - ' End If Dim ffmpeg = New ffmpegEnc() + For x = 0 To ffmpeg.Params.Codec.Options.Length - 1 Dim ffmpeg2 = New ffmpegEnc() ffmpeg2.Params.Codec.Value = x diff --git a/Encoding/x265Enc.vb b/Encoding/x265Enc.vb index 6f4e096a..44afb1c0 100644 --- a/Encoding/x265Enc.vb +++ b/Encoding/x265Enc.vb @@ -194,7 +194,7 @@ Public Class x265Params .Switches = {"--crf", "--qp"}, .Name = "Quant", .Text = "Quality", - .Value = 20, + .Value = 28, .Config = {0, 51, 1, 1}} Property chunkstart As New NumParam With { @@ -225,7 +225,7 @@ Public Class x265Params .Text = "Mode", .Switches = {"--bitrate", "--qp", "--crf", "--pass"}, .Options = {"Bitrate", "Quantizer", "Quality", "Two Pass", "Three Pass"}, - .Value = 2} + .Value = 3} Property SSIM As New BoolParam With { .Switch = "--ssim", @@ -274,7 +274,8 @@ Public Class x265Params Property slowpass As New BoolParam With { .Switch = "--slow-firstpass", .NoSwitch = "--no-slow-firstpass", - .Init = True, .Text = "Slow Firstpass"} + .Init = True, + .Text = "Slow Firstpass"} Property [Me] As New OptionParam With { .Switch = "--me", @@ -651,7 +652,7 @@ Public Class x265Params .Config = {0.5, 1.0, 0.1, 1}, .Init = 1} - Property VBVfradj As New NumParam With { 'Need More Testing But Should work As it is. + Property VBVfradj As New NumParam With { .Switch = "--vbv-end-fr-adj", .Text = "VBV Adjust", .Config = {0, 1, 0.1, 1},