diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf index 5dbec9f..cb8be68 100644 --- a/.config/mpv/input.conf +++ b/.config/mpv/input.conf @@ -4,8 +4,8 @@ DOWN add volume -2 D cycle deband CTRL+1 apply-profile "common"; show_text ${glsl-shaders} -CTRL+2 apply-profile "common-alter"; show_text ${glsl-shaders} -CTRL+3 apply-profile "anime"; show_text ${glsl-shaders} +CTRL+2 apply-profile "anime"; show_text ${glsl-shaders} +CTRL+8 apply-profile "append-shaders"; show_text ${glsl-shaders} CTRL+9 apply-profile "append-shaders" restore; show_text ${glsl-shaders} CTRL+0 change-list glsl-shaders clr "" diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 7090abb..84bbdb9 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -36,6 +36,8 @@ screenshot-webp-lossless screenshot-directory='~/Userdata/Pictures/' # ==== 杂项 ==== +# socket文件路径 +input-ipc-server=/tmp/mpvsocket # 进度数据文件存放目录 watch-later-directory='~/.data/mpv/watch_later/' @@ -51,8 +53,8 @@ video-sync=display-resample interpolation tscale=oversample -# 可选值: common, common-alter, anime # 会覆盖scale和cscale +# 可选值common或者anime profile=common [common] @@ -63,16 +65,9 @@ glsl-shaders="~~/shaders/FSRCNNX_x2_8-0-4-1.glsl" # 其他着色器 profile=append-shaders -[common-alter] -profile-desc=普通视频[16-0-4-1] -# FSRCNNX着色器 -# https://github.com/igv/FSRCNN-TensorFlow/ -glsl-shaders="~~/shaders/FSRCNNX_x2_16-0-4-1.glsl" -# 其他着色器 -profile=append-shaders - [anime] -profile-desc=低分辨率动画专用 +profile-desc=低分辨率动画 +# FSRCNNX着色器 # https://github.com/HelpSeeker/FSRCNN-TensorFlow/ glsl-shaders="~~/shaders/FSRCNNX_x2_16-0-4-1_anime_enhance.glsl" # 其他着色器 @@ -88,11 +83,3 @@ glsl-shaders-append="~~/shaders/KrigBilateral.glsl" # https://gist.github.com/igv/8a77e4eb8276753b54bb94c1c50c317e sigmoid-upscaling=no glsl-shaders-append="~~/shaders/adaptive-sharpen.glsl" - -[svp] -profile-desc=SVP补帧 -hwdec=auto-copy-safe -input-ipc-server=/tmp/mpvsocket -# 禁用不兼容的选项 -hr-seek-framedrop=no -resume-playback=no diff --git a/.config/mpv/tools/update.sh b/.config/mpv/tools/update.sh index b89db0f..d15db14 100755 --- a/.config/mpv/tools/update.sh +++ b/.config/mpv/tools/update.sh @@ -1,10 +1,5 @@ #!/usr/bin/bash -e -if ! command -v 7z &>/dev/null; then - echo p7zip is missing >&2 - exit 1 -fi - config_dir=${XDG_CONFIG_HOME:-~/.config}/mpv/ script_dir=${config_dir}/scripts/ shader_dir=${config_dir}/shaders/ @@ -24,11 +19,6 @@ curl -fL --create-dirs -o "${script_dir}/zenity-open-files.lua" \ https://github.com/alifarazz/mpv-zenity-open-files/raw/master/zenity-open-files.lua echo "Updating shaders..." -curl -fL --create-dirs -o /tmp/mpv/fsrcnnx.7z \ - https://github.com/igv/FSRCNN-TensorFlow/releases/download/1.1/checkpoints_params.7z \ - && 7z e -o"${shader_dir}" -y /tmp/mpv/fsrcnnx.7z FSRCNNX_x2_16-0-4-1.glsl \ - && rm /tmp/mpv/fsrcnnx.7z - curl -fL --create-dirs -o "${shader_dir}/FSRCNNX_x2_8-0-4-1.glsl" \ https://github.com/igv/FSRCNN-TensorFlow/releases/download/1.1/FSRCNNX_x2_8-0-4-1.glsl