Skip to content

Commit

Permalink
Catch up with VS R57 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
theChaosCoder committed Oct 16, 2021
1 parent ceedc62 commit 9024538
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 13 deletions.
4 changes: 3 additions & 1 deletion VapourSynth64Portable/VapourSynth64/seek-test.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
parser.add_argument('-f', choices=choices_filter, dest='source_filter', help='Set source filter')
args = parser.parse_args()

c = vs.get_core(add_cache=False)
c = vs.core

extension = os.path.splitext(args.file)[1]
if(extension == ".d2v"):
Expand All @@ -53,6 +53,8 @@
clip = c.ffms2.Source(args.file, seekmode=0)
if(args.source_filter == "lsmas"):
clip = c.lsmas.LWLibavSource(args.file)
if(args.source_filter == "lsmasav"):
clip = c.lsmas.LibavSMASHSource(args.file)
if(args.source_filter == "d2v"):
clip = c.d2v.Source(args.file, rff=False)
if(args.source_filter == "dgi"):
Expand Down
2 changes: 1 addition & 1 deletion VapourSynth64Portable/VapourSynth64/vs_plugin_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def main(argv):
exit("\n\rUsage: vs_plugin_check.py <path-to-vapoursynth-plugins-folder>\n\r")
#print("\nFound the following path:", path)

core = vs.get_core()
core = vs.core
print_version(core)
plugin_dir = glob.glob(path + '/*.dll')

Expand Down
2 changes: 1 addition & 1 deletion VapourSynth64Portable/rav1e_8bit_encode_example.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ set out=rav1e_encode.ivf
set script="test.vpy"
set params=--quantizer 100 --tune Psychovisual

VapourSynth64\vspipe.exe "%script%" - --y4m | "bin\rav1e.exe" - %params% --output "%out%"
VapourSynth64\vspipe.exe "%script%" -c y4m - | "bin\rav1e.exe" - %params% --output "%out%"
pause
11 changes: 4 additions & 7 deletions VapourSynth64Portable/test.vpy
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,19 @@ import functools
import vapoursynth as vs

import mvsfunc as mvf
import havsfunc as haf
import muvsfunc as muf

core = vs.get_core()
core = vs.core

time = 2.0

reta = core.colorbars.ColorBars(resolution=2, format=vs.YUV444P10).std.DuplicateFrames([0] * 120)
reta = muf.ColorBarsHD().std.DuplicateFrames([0] * 120)
retb = reta.std.Invert().std.FlipVertical().grain.Add(var = 200)

# Animation powered by vcmohans awesome vctrans plugin
# Source: http://www.avisynth.nl/users/vcmohan/vctrans/vctrans.html

ret = core.trans.Accord(reta, clipb = retb, overlap = time, twin = 0, dir = 1, open = 0)
ret = ret + core.trans.Accord(retb, clipb = reta, overlap = time, twin = 1, dir = 1, open = 0)
ret = ret + core.trans.Accord(reta, clipb = retb, overlap = time, twin = 0, dir = 0, open = 0)
ret = ret + core.trans.Accord(retb, clipb = reta, overlap = time, twin = 1, dir = 0, open = 0)
ret = core.trans.Accord(retb, clipb = reta, overlap = time, twin = 1, dir = 0, open = 0)
vid = core.text.Text(ret, "Accord", 2)
ret = core.trans.Bubbles(reta, clipb = retb, overlap = time, static = 0)
ret = ret + core.trans.Bubbles(retb, clipb = reta, overlap = time, static = 1)
Expand Down
2 changes: 1 addition & 1 deletion VapourSynth64Portable/x264_8bit_encode_example.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ set out=x264_8bit_encode.mkv
set script="test.vpy"
set params=--crf 17 --preset medium --output-depth 8

VapourSynth64\vspipe.exe "%script%" - --y4m | "bin\x264.exe" --demuxer y4m %params% -o "%out%" -
VapourSynth64\vspipe.exe "%script%" -c y4m - | "bin\x264.exe" --demuxer y4m %params% -o "%out%" -
pause
2 changes: 1 addition & 1 deletion VapourSynth64Portable/x265_10bit_encode_example.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ set out=x265_10bit_encode.hevc
set script="test.vpy"
set params=--crf 17 --preset fast --no-strong-intra-smoothing --no-sao --output-depth 10

VapourSynth64\vspipe.exe "%script%" - --y4m | "bin\x265.exe" - --y4m %params% -o "%out%"
VapourSynth64\vspipe.exe "%script%" -c y4m - | "bin\x265.exe" - --y4m %params% -o "%out%"
pause
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $vsfolder = "VapourSynth64Portable\VapourSynth64"
$vsfolder_full = "$PSScriptRoot\VapourSynth64Portable\VapourSynth64"

$url_python = "https://www.python.org/ftp/python/3.9.7/python-3.9.7-embed-amd64.zip"
$url_vs = "https://github.com/vapoursynth/vapoursynth/releases/download/R56/VapourSynth64-Portable-R56.7z"
$url_vs = "https://github.com/vapoursynth/vapoursynth/releases/download/R57/VapourSynth64-Portable-R57.7z"
$url_pip = "https://bootstrap.pypa.io/get-pip.py"
$url_vseditor = "https://github.com/YomikoR/VapourSynth-Editor/releases/download/r19-mod-3/VapourSynth-Editor-r19-mod-3-x86_64.7z"
$url_vseditor2 = "https://bitbucket.org/gundamftw/vapoursynth-editor-2/downloads/VapourSynthEditor2-R6-64bit.7z"
Expand Down

0 comments on commit 9024538

Please sign in to comment.