Permalink
Browse files

-

  • Loading branch information...
stax76
stax76 committed Aug 6, 2017
1 parent 80d3176 commit 82808a51055c89655f245a66401e438414fb5232
View
@@ -308,7 +308,7 @@ Public Class x265Params
.Name = "CompCheckQuant",
.Text = "Comp. Check",
.Value = 18,
.Help = "CRF value used as 100%",
.Help = "CRF value used as 100% for the compressibility check.",
.Config = {1, 50}}
Property CompCheckAimedQuality As New NumParam With {
@@ -572,16 +572,6 @@ Public Class x265Params
.Switch = "--strict-cbr",
.Text = "Strict CBR"}
Property CBQPoffs As New NumParam With {
.Switch = "--cbqpoffs",
.Text = "Cb QP Offset",
.Config = {-12, 12}}
Property CRQPoffs As New NumParam With {
.Switch = "--crqpoffs",
.Text = "CR QP Offset",
.Config = {-12, 12}}
Property NRintra As New NumParam With {
.Switch = "--nr-intra",
.Text = "Intra Noise Reduct.",
@@ -808,7 +798,9 @@ Public Class x265Params
New BoolParam With {.Switch = "--ssim-rd", .Text = "SSIM RDO"})
Add("Rate Control",
New StringParam With {.Switch = "--zones", .Text = "Zones"},
AQmode, qgSize, AQStrength, QComp, CBQPoffs,
AQmode, qgSize, AQStrength, QComp,
New NumParam With {.Switch = "--cbqpoffs", .Text = "CB QP Offset", .Config = {-12, 12}},
New NumParam With {.Switch = "--crqpoffs", .Text = "CR QP Offset", .Config = {-12, 12}},
NRintra, NRinter, qpmin, qpmax, qpstep, CRFmin, CRFmax)
Add("Rate Control 2",
VBVbufsize, VBVmaxrate, VBVinit,
@@ -1041,7 +1033,7 @@ Public Class x265Params
LimitTU.Value = 0
LookaheadSlices.Value = 8
MaxCuSize.Value = 0
MinCuSize.Value = 3
MinCuSize.Value = 2
PBRatio.Value = 1.3
PsyRD.Value = 2.0
PsyRDOQ.Value = 1
@@ -1065,7 +1057,7 @@ Public Class x265Params
MaxCuSize.Value = 1
MaxMerge.Value = 2
MErange.Value = 25
MinCuSize.Value = 2
MinCuSize.Value = 1
RCLookahead.Value = 5
RD.Value = 2
rdoqLevel.Value = 0
@@ -1337,7 +1329,7 @@ Public Class x265Params
LimitTU.DefaultValue = 0
LookaheadSlices.DefaultValue = 8
MaxCuSize.DefaultValue = 0
MinCuSize.DefaultValue = 3
MinCuSize.DefaultValue = 2
PBRatio.DefaultValue = 1.3
PsyRD.DefaultValue = 2.0
PsyRDOQ.DefaultValue = 1
@@ -1361,7 +1353,7 @@ Public Class x265Params
MaxCuSize.DefaultValue = 1
MaxMerge.DefaultValue = 2
MErange.DefaultValue = 25
MinCuSize.DefaultValue = 2
MinCuSize.DefaultValue = 1
RCLookahead.DefaultValue = 5
RD.DefaultValue = 2
rdoqLevel.DefaultValue = 0
View
@@ -1839,7 +1839,6 @@ Public Class MainForm
End If
If Not g.VerifyRequirements() Then Throw New AbortException
g.SetTempDir()
p.LastOriginalSourceFile = p.SourceFile
p.FirstOriginalSourceFile = p.SourceFile
@@ -1853,28 +1852,38 @@ Public Class MainForm
End If
ElseIf p.SourceFile.Ext.EqualsAny({"avs", "vpy"}) Then
Dim code = File.ReadAllText(p.SourceFile)
Dim reg = If(p.SourceFile.Ext = "vpy", "source\(.*?('|"")(.+?)\1", "(source)\(""(.+?)""")
Dim match = Regex.Match(code, reg, RegexOptions.IgnoreCase)
Dim matches = Regex.Matches(code, "('|"")(.+?)\1", RegexOptions.IgnoreCase)
If match.Success Then
Dim path = match.Groups(2).Value
For Each match As Match In matches
If match.Success Then
Dim path = match.Groups(2).Value
If Not path.Contains("\") AndAlso File.Exists(p.SourceFile.Dir + path) Then
p.TempDir = p.SourceFile.Dir
path = p.SourceFile.Dir + path
End If
If File.Exists(path) AndAlso FileTypes.Video.Contains(path.Ext) Then
If FileTypes.VideoIndex.Contains(path.Ext) Then
path = GetPathFromIndexFile(path)
If File.Exists(path) AndAlso FileTypes.Video.Contains(path.Ext) Then
If FileTypes.VideoIndex.Contains(path.Ext) Then
path = GetPathFromIndexFile(path)
If path <> "" Then
If path <> "" Then
p.LastOriginalSourceFile = path
p.FirstOriginalSourceFile = path
Exit For
End If
Else
p.LastOriginalSourceFile = path
p.FirstOriginalSourceFile = path
Exit For
End If
Else
p.LastOriginalSourceFile = path
p.FirstOriginalSourceFile = path
End If
End If
End If
Next
End If
g.SetTempDir()
Dim sourcePAR = MediaInfo.GetVideo(p.LastOriginalSourceFile, "PixelAspectRatio")
If sourcePAR <> "" Then
@@ -4433,7 +4442,7 @@ Public Class MainForm
ret.Add("Help|Website", Symbol.Globe)
ret.Add("Help|Website|Issue Tracker", NameOf(g.DefaultCommands.ExecuteCommandLine), Symbol.fa_bug, {"https://github.com/stax76/staxrip/issues"})
ret.Add("Help|Website|Release Build", NameOf(g.DefaultCommands.ExecuteCommandLine), {"https://github.com/stax76/staxrip/releases"})
ret.Add("Help|Website|Test Build", NameOf(g.DefaultCommands.ExecuteCommandLine), {"https://github.com/stax76/staxrip/blob/master/md/test-build.md"})
ret.Add("Help|Website|Test Build", NameOf(g.DefaultCommands.ExecuteCommandLine), {"https://github.com/stax76/staxrip/blob/master/md/changelog.md"})
ret.Add("Help|Donate", NameOf(g.DefaultCommands.ExecuteCommandLine), Symbol.Heart, {Strings.DonationsURL})
ret.Add("Help|Scripting", NameOf(ShowScriptingHelp), Symbol.Code)
ret.Add("Help|Command Line", NameOf(ShowCommandLineHelp), Symbol.fa_terminal)
View
@@ -279,6 +279,12 @@ Public Class ProcForm
Activate()
End Sub
Sub HideForm()
WindowState = FormWindowState.Normal
NotifyIcon.Visible = False
Hide()
End Sub
Protected Overrides Sub OnActivated(e As EventArgs)
MyBase.OnActivated(e)
UpdateControls()
View
@@ -247,23 +247,6 @@ Public Class SourceFilesForm
If DialogResult = DialogResult.OK Then
Dim files = GetFiles()
If g.ShowVideoSourceWarnings(GetFiles) Then e.Cancel = True
If Not IsMerge Then
For Each i In files
For Each i2 In files
Dim a = Filepath.GetDirAndBase(i).ToUpper
Dim b = Filepath.GetDirAndBase(i2).ToUpper
If a <> b Then
If a.StartsWith(b) Then
MsgWarn("Files starting with the names of other files can't be used.", b + BR2 + a)
e.Cancel = True
Exit For
End If
End If
Next
Next
End If
End If
MyBase.OnFormClosing(e)
View
@@ -797,7 +797,7 @@ Public Class eac3toForm
If ms.Codec.Contains(",") Then ms.Codec = ms.Codec.Left(",")
ms.IsVideo = ms.Codec.EqualsAny("h264/AVC", "VC-1", "MPEG2")
ms.IsAudio = ms.Codec.EqualsAny("DTS Master Audio", "DTS", "DTS-ES", "DTS Hi-Res", "DTS Express", "AC3", "AC3 EX", "AC3 Surround", "EAC3", "E-AC3", "E-AC3 EX", "E-AC3 Surround", "TrueHD/AC3", "TrueHD/AC3 (Atmos)", "TrueHD (Atmos)", "RAW/PCM", "MP2")
ms.IsAudio = ms.Codec.EqualsAny("DTS Master Audio", "DTS", "DTS-ES", "DTS Hi-Res", "DTS Express", "AC3", "AC3 EX", "AC3 Headphone", "AC3 Surround", "EAC3", "E-AC3", "E-AC3 EX", "E-AC3 Surround", "TrueHD/AC3", "TrueHD/AC3 (Atmos)", "TrueHD (Atmos)", "RAW/PCM", "MP2")
ms.IsSubtitle = ms.Codec.StartsWith("Subtitle")
ms.IsChapters = ms.Codec.StartsWith("Chapters")
@@ -810,7 +810,7 @@ Public Class eac3toForm
Next
Select Case ms.Codec
Case "AC3 EX", "AC3 Surround"
Case "AC3 EX", "AC3 Surround", "AC3 Headphone"
ms.OutputType = "ac3"
Case "E-AC3", "E-AC3 EX"
ms.OutputType = "eac3"
@@ -282,7 +282,9 @@ Public Class ApplicationSettings
End Sub
Sub Migrate()
If Not Storage.GetBool("main menu update 1") Then
Dim mainMenuVersion = 12
If Not Storage.GetBool("main menu update" & mainMenuVersion) Then
If 0 = CustomMenuMainForm.GetAllItems().Where(
Function(val) Not val.Parameters.NothingOrEmpty AndAlso
TypeOf val.Parameters(0) Is String AndAlso
@@ -291,7 +293,17 @@ Public Class ApplicationSettings
CustomMenuMainForm.Add("Tools|Directories|Log Files", NameOf(g.DefaultCommands.ExecuteCommandLine), {"""%settings_dir%Log Files"""})
End If
Storage.SetBool("main menu update 1", True)
For Each i In CustomMenuMainForm.GetAllItems()
If i.MethodName = NameOf(g.DefaultCommands.ExecuteCommandLine) AndAlso
i.Parameters.Count > 0 AndAlso TypeOf i.Parameters(0) Is String AndAlso
i.Parameters(0).ToString <> "" AndAlso i.Parameters(0).ToString.EndsWith("test-build.md") Then
i.Parameters(0) = "https://github.com/stax76/staxrip/blob/master/md/changelog.md"
Exit For
End If
Next
Storage.SetBool("main menu update" & mainMenuVersion, True)
End If
For Each i In AudioProfiles
View
@@ -376,7 +376,9 @@ Namespace CommandLine
Property Value As Integer
Get
Return Store.Int(GetKey)
Dim ret = Store.Int(GetKey)
If ret > Options.Length - 1 Then ret = Options.Length - 1
Return ret
End Get
Set(value As Integer)
ValueValue = value
View
@@ -187,13 +187,13 @@ Public Class CommandLineDemuxer
proc.SkipPatterns = {"^\d+ %$"}
End If
proc.Header = Name
proc.Header = "Process"
proc.File = Macro.Expand(Command)
proc.Arguments = Macro.Expand(Arguments)
proc.Start()
If Command?.Contains("DGIndex") Then
FileHelp.Move(Filepath.GetDirAndBase(p.SourceFile) + ".log", p.TempDir + p.SourceFile.Base + "_dg.log")
FileHelp.Move(p.SourceFile.DirAndBase + ".log", p.TempDir + p.SourceFile.Base + "_dg.log")
FileHelp.Move(p.TempDir + p.SourceFile.Base + ".demuxed.m2v", p.TempDir + p.SourceFile.Base + ".m2v")
End If
End Using
View
@@ -597,7 +597,7 @@ Public Class GlobalClass
Directory.CreateDirectory(p.TempDir)
Catch
Try
p.TempDir = Filepath.GetDirAndBase(p.SourceFile) + "_temp\"
p.TempDir = p.SourceFile.DirAndBase + "_temp\"
If Not Directory.Exists(p.TempDir) Then Directory.CreateDirectory(p.TempDir)
Catch
MsgWarn("Failed to create a temp directory. By default it's created in the directory of the source file so it's not possible to open files directly from a optical drive unless a temp directory is defined in the options. Usually discs are copied to the hard drive first using a application like MakeMKV, DVDfab or AnyDVD.")
View
@@ -250,7 +250,12 @@ Public Class Proc
If ReadOutput Then
ProcController.Start(Me)
Log.WriteLine(CommandLine + BR2)
If File = "cmd.exe" AndAlso Arguments?.StartsWith("/S /C """) AndAlso Arguments?.EndsWith("""") Then
Log.WriteLine(Arguments.Substring(7, Arguments.Length - 8) + BR2)
Else
Log.WriteLine(CommandLine + BR2)
End If
End If
If Not LogItems Is Nothing Then
View
@@ -74,6 +74,8 @@ Public Class ProcController
SetTaskbarProgress(value)
End Sub
Shared LastProgress As Single
Sub SetTaskbarProgress(value As String)
If Proc.IsSilent Then Exit Sub
@@ -84,13 +86,24 @@ Public Class ProcController
If value.Contains(" ") Then value = value.RightLast(" ")
If value.IsSingle Then
ProcForm.Taskbar?.SetState(TaskbarStates.Normal)
ProcForm.Taskbar?.SetValue(value.ToSingle, 100)
Dim val = value.ToSingle
If LastProgress <> val Then
ProcForm.Taskbar?.SetState(TaskbarStates.Normal)
ProcForm.Taskbar?.SetValue(val, 100)
ProcForm.NotifyIcon.Text = val & "%"
LastProgress = val
End If
Exit Sub
End If
End If
ProcForm.Taskbar?.SetState(TaskbarStates.NoProgress)
If LastProgress <> 0 Then
ProcForm.NotifyIcon.Text = "StaxRip"
ProcForm.Taskbar?.SetState(TaskbarStates.NoProgress)
LastProgress = 0
End If
End Sub
Private Sub Click(sender As Object, e As EventArgs)
@@ -189,17 +202,12 @@ Public Class ProcController
End Sub
Shared Sub Finished()
g.ProcForm.BeginInvoke(Sub()
g.ProcForm.WindowState = FormWindowState.Normal
g.ProcForm.NotifyIcon.Visible = False
g.ProcForm.Hide()
g.MainForm.BeginInvoke(Sub()
BlockActivation = False
g.MainForm.Show()
g.MainForm.Refresh()
Aborted = False
End Sub)
g.ProcForm.BeginInvoke(Sub() g.ProcForm.HideForm())
g.MainForm.BeginInvoke(Sub()
BlockActivation = False
g.MainForm.Show()
g.MainForm.Refresh()
Aborted = False
End Sub)
End Sub
View
@@ -1,6 +1,6 @@
MIT License
Copyright (c) 2002-2017 Frank Skare
Copyright (c) 2002-2017 stax76
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and ssociated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
@@ -7,4 +7,4 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCopyright("stax76")>
<Assembly: ComVisible(False)>
<Assembly: Guid("54d5dc0f-6ba7-42f0-a82f-9c71d561cb8b")>
<Assembly: AssemblyVersion("1.6.0.2")>
<Assembly: AssemblyVersion("1.6.0.3")>
View
@@ -45,9 +45,11 @@ I also provide help in various forums that can be found at:
Main Menu > Help > Support Forum
If you don't want to register at github or in a forum you can also mail me at frank.skare.de at gmail com
Most of the time I need a full log file which you can publish at www.pastebin.com, enable auto expire after 30 days.
Screenshots are also often useful, there are many free and easy to use hosting services like https://postimage.io/
Screenshots are also often useful, there are many free and easy to use hosting services like https://postimage.io/ or https://imgbox.com/
Before making a bug report please try the newest test build:
View
@@ -10,6 +10,19 @@ https://drive.google.com/open?id=0B-gPKiJYuKuITld4dzhuTC1WWWM
https://onedrive.live.com/redir?resid=604D4754F64B0ABC!4140&authkey=!ANUm9V3vTPmEFNI&ithint=folder%2c7z
#### 1.6.0.3 unstable test build
- new: the tray icon shows the progress as tooltip, this was removed before because of implementation problems (email request)
- fix: for avs and vpy source files the detection of the video source file referenced in the script is more reliable (https://github.com/stax76/staxrip/issues/248)
- fix: if avs and vpy files use relative paths for the video source file the temp dir is set to the path of the avs file (https://github.com/stax76/staxrip/issues/248)
- fix: dead link in main menu to the test build page (https://github.com/stax76/staxrip/issues/252)
- fix: 2 bugs in the x265 GUI fixed (https://github.com/stax76/staxrip/issues/255)
- change: the warning that files with the same beginning then other files can't be used for file batch was removed (https://forum.doom9.org/showthread.php?p=1813803#post1813803)
- usability: cmd.exe /S /C "command line" is still used for execution but now only the command line is printed to the logfile
#### 1.6.0.2 unstable test build
- fix: incorrect command line generated for VCEEnc

0 comments on commit 82808a5

Please sign in to comment.