Merge branch 'master' of github.com:K4YT3X/video2x

This commit is contained in:
K4YT3X 2018-12-22 15:21:05 -05:00
commit b7ebad5c0b
3 changed files with 10 additions and 3 deletions

View File

@ -25,7 +25,7 @@ For short: **Video2X enlarges your video without losing details**
Watch for the sharper edges in this screenshot around the shadows:
[![preview](https://user-images.githubusercontent.com/18014964/36638068-19cdb78c-19b8-11e8-8dfb-406b7015d30c.png)](https://www.youtube.com/watch?v=PG94iPoeoZk)
[![preview](https://user-images.githubusercontent.com/21986859/49412428-65083280-f73a-11e8-8237-bb34158a545e.png)
**Or you can watch the YouTube video Demo: https://www.youtube.com/watch?v=PG94iPoeoZk**

View File

@ -33,7 +33,14 @@ def enroll_settings():
settings['waifu2x_path'] = get_path('waifu2x-caffe-cui.exe path: ')
settings['ffmpeg_path'] = get_path('ffmpeg binaries directory: ')
settings['ffmpeg_arguments'] = Avalon.gets('Extra arguments passed to ffmpeg: ')
settings['ffmpeg_arguments'] = []
while True:
argument = Avalon.gets('Extra arguments passed to ffmpeg (empty when done): ')
if argument:
settings['ffmpeg_arguments'].append(argument)
else:
break
settings['ffmpeg_hwaccel'] = Avalon.gets('ffmpeg hardware acceleration method (cuda): ')
if settings['ffmpeg_hwaccel'] == '':

View File

@ -113,7 +113,7 @@ class Video2xSetup:
settings['waifu2x_path'] = '{}\\video2x\\waifu2x-caffe\\waifu2x-caffe-cui.exe'.format(os.getenv('localappdata'))
settings['ffmpeg_path'] = '{}\\video2x\\ffmpeg-4.1-win64-static\\bin'.format(os.getenv('localappdata'))
settings['ffmpeg_arguments'] = ''
settings['ffmpeg_arguments'] = []
settings['ffmpeg_hwaccel'] = 'cuda'
with open('video2x.json', 'w') as config: