diff --git a/README.md b/README.md index fa2ee6a..90e50af 100644 --- a/README.md +++ b/README.md @@ -70,12 +70,12 @@ With your own parameters: --mkvmerge Use mkvmerge for concatenating instead of ffmpeg. Use in case when concatenation fails. - + -c --config Save config file with given name if doesn't exists. - Reads config file with that name. + Reads config file with that name. Options provided to cli overwrite config values. All options excepth in/out/vmaf/log/temp/config paths are saved. - +

FFmpeg options

-a --audio_params FFmpeg audio settings (Default: copy audio from source to output) @@ -103,8 +103,8 @@ With your own parameters: -cm --chunk_method Determine way in which chunks made for encoding. By default selected best one avalable. - vs_lsmash > vs_ffms2 > hybrid - ['hybrid'(default), 'select', 'vs_ffms2', 'vs_lsmash'(Recomended To Install)] + vs_ffms2 > vs_lsmash > hybrid + ['hybrid'(default), 'select', 'vs_ffms2'(Recomended To Install), 'vs_lsmash'] -tr --threshold PySceneDetect threshold for scene detection Default: 35 diff --git a/Startup/setup.py b/Startup/setup.py index 673d8f1..719a1fc 100755 --- a/Startup/setup.py +++ b/Startup/setup.py @@ -50,12 +50,14 @@ def select_best_chunking_method(project: Project): import vapoursynth plugins = vapoursynth.get_core().get_plugins() - if 'systems.innocent.lsmas' in plugins: - log('Set Chunking Method: L-SMASH\n') - project.chunk_method = 'vs_lsmash' - elif 'com.vapoursynth.ffms2' in plugins: + if 'com.vapoursynth.ffms2' in plugins: log('Set Chunking Method: FFMS2\n') project.chunk_method = 'vs_ffms2' + + elif 'systems.innocent.lsmas' in plugins: + log('Set Chunking Method: L-SMASH\n') + project.chunk_method = 'vs_lsmash' + except: log('Vapoursynth not installed but vspipe reachable\n' + 'Fallback to Hybrid\n')