mpv-lazy-20230127

hooke007 · Jan 27, 2023 · f0294a5 · f0294a5
1 parent 3f68c5b
commit f0294a5
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 78 deletions.
diff --git a/portable_config/input_uosc.conf b/portable_config/input_uosc.conf
@@ -27,17 +27,20 @@
  Shift+BS          set audio-delay 0 ; set sub-delay 0                   #! 播放 > 重置 音频与字幕同步
 
  ~                 vf clr ""                                             #! VF 滤镜 > 清空
- !                 vf set vapoursynth="~~/vs/rife_2x.vpy"                #! VF 滤镜 > 预设 RIFE倍帧
- @                 vf set vapoursynth="~~/vs/rife_std.vpy"               #! VF 滤镜 > 预设 RIFE标准
- SHARP             vf set vapoursynth="~~/vs/rife_cuda.vpy"              #! VF 滤镜 > 预设 RIFE_NVIDIA
+ !                 vf set vapoursynth="~~/vs/mvtools_2x.vpy"             #! VF 滤镜 > 预设 MVTools_补帧_2x
+ @                 vf set vapoursynth="~~/vs/mvtools_std.vpy"            #! VF 滤镜 > 预设 MVTools_补帧_标准
+ SHARP             vf set vapoursynth="~~/vs/rife_2x.vpy"                #! VF 滤镜 > 预设 RIFE_补帧_2x
+ $                 vf set vapoursynth="~~/vs/rife_std.vpy"               #! VF 滤镜 > 预设 RIFE_补帧_标准
+ %                 vf set vapoursynth="~~/vs/rife_cuda.vpy"              #! VF 滤镜 > 预设 RIFE_补帧_NVIDIA
 
  Ctrl+`            change-list glsl-shaders clr ""                                            #! 着色器 > 清空
- Ctrl+1            change-list glsl-shaders toggle "~~/shaders/AMD_FSR_EASU_rgb.glsl"         #! 着色器 > 开关 FSR_EASU_后
- Ctrl+2            change-list glsl-shaders toggle "~~/shaders/Anime4K_Restore_CNN_L.glsl"    #! 着色器 > 开关 A4K_重建_CNN_L
+ Ctrl+1            change-list glsl-shaders toggle "~~/shaders/KrigBilateral.glsl"            #! 着色器 > 开关 Krig
+ Ctrl+2            change-list glsl-shaders toggle "~~/shaders/AMD_FSR_rgb.glsl"              #! 着色器 > 开关 FSR_后
+ Ctrl+3            change-list glsl-shaders toggle "~~/shaders/Anime4K_Restore_CNN_L.glsl"    #! 着色器 > 开关 A4K_重建_CNN_L
  Ctrl+4            change-list glsl-shaders toggle "~~/shaders/Anime4K_Upscale_GAN_x2_M.glsl" #! 着色器 > 开关 A4K_放大_GAN_M
- Ctrl+3            change-list glsl-shaders toggle "~~/shaders/adaptive_sharpen.glsl"         #! 着色器 > 开关 自适应锐化_后
- Ctrl+5            change-list glsl-shaders toggle "~~/shaders/KrigBilateral.glsl"            #! 着色器 > 开关 Krig
- Ctrl+6            change-list glsl-shaders toggle "~~/shaders/FSRCNNX_x2_16_0_4_1.glsl"      #! 着色器 > 开关 FSRCNNX_16
+ Ctrl+5            change-list glsl-shaders toggle "~~/shaders/adaptive_sharpen.glsl"         #! 着色器 > 开关 自适应锐化_后
+ Ctrl+6            change-list glsl-shaders toggle "~~/shaders/nnedi3_nns128_win8x4.glsl"     #! 着色器 > 开关 nneid3_128_8x4
+ Ctrl+7            change-list glsl-shaders toggle "~~/shaders/FSRCNNX_x2_16_0_4_1.glsl"      #! 着色器 > 开关 FSRCNNX_16
 
  Ctrl+s            script-binding uosc/shot                              #! ※ 截屏
 
@@ -95,6 +98,7 @@
 
  ESC               set fullscreen no
  ENTER             set fullscreen yes
+ Alt+ENTER         cycle fullscreen
  SPACE             cycle pause
  UP                seek -1 exact
  DOWN              seek  1 exact

diff --git a/portable_config/mpv.conf b/portable_config/mpv.conf
@@ -34,7 +34,7 @@
 
  hr-seek-framedrop = no
  save-position-on-quit = yes
- watch-later-options = vid,aid,sid
+ watch-later-options = start,vid,aid,sid
 
  keep-open = yes
 #ontop = yes
@@ -99,11 +99,11 @@
 
  cscale = bilinear
  scale = spline36
- dscale = spline36
+ dscale = bicubic
 #sigmoid-upscaling = yes
 #correct-downscaling = yes
 
-#dither-depth = 8
+#dither-depth = 10
 #dither = error-diffusion
 #deband = yes
 

diff --git a/portable_config/profiles.conf b/portable_config/profiles.conf
@@ -11,6 +11,14 @@
  ontop = yes
 
 
+## https://github.com/mpv-player/mpv/issues/11122
+[ontop_playback]
+ profile-desc = 基于刷新率的同步模式
+ profile-cond = p.display_fps>143
+ profile-restore = copy
+ video-sync = audio
+
+
 [deband_bitrate]
  profile-desc = 基于码率的自动去色带
  profile-cond = ((p.file_size/1024)*8)/p.duration<=3000

diff --git a/portable_config/script-opts.conf b/portable_config/script-opts.conf
@@ -1,67 +1,67 @@
-### https://github.com/hooke007/MPV_lazy/blob/main/portable_config/script-opts.conf
-
-##⇘⇘脚本选项
-
-
-##########
-# 控制台 #
-##########
-
-#script-opts-append = console-scale=1.2
- script-opts-append = console-font=Ubuntu Mono
- script-opts-append = console-font_size=20
-
-
-############
-# 统计数据 #
-############
-
- script-opts-append = stats-duration=2
- script-opts-append = stats-redraw_delay=0.5
- script-opts-append = stats-persistent_overlay=yes
- script-opts-append = stats-filter_params_max_length=1
-
-
-########
-# YTDL #
-########
-
-#script-opts-append = ytdl_hook-all_formats=yes
-#script-opts-append = ytdl_hook-force_all_formats=no
-#script-opts-append = ytdl_hook-use_manifests=yes
-
-#script-opts-append = ytdl_path=youtube-dl
-
-
-######################
-# 保存全局属性并恢复 #
-######################
-
- script-opts-append = save_global_props-props=volume,glsl-shaders
-#script-opts-append = save_global_props-cache_dir=~~/
-
-
-################
-# 新缩略图引擎 #
-################
-
- script-opts-append = thumbfast-min_duration=30
-#script-opts-append = thumbfast-precise=yes
-#script-opts-append = thumbfast-hwdec=no
-
-
-##################
-# 多功能控制界面 #
-##################
-
-#script-opts-append = uosc-timeline_size_min=0
-#script-opts-append = uosc-timeline_size_min_fullscreen=4
-
-#script-opts-append = uosc-autoload=yes
-
-#script-opts-append = uosc-ui_scale=2
-#script-opts-append = uosc-click_threshold=1000
- script-opts-append = uosc-media_types=aac,ape,avi,dsf,dts,flac,flv,m2ts,m4a,m4v,mka,mkv,mov,mp3,mp4,mpeg,mpg,ogg,ogv,opus,rm,rmvb,ts,vob,wav,webm,wma,wmv,wv
- script-opts-append = uosc-subtitle_types=ass,idx,lrc,mks,pgs,sup,srt,ssa,txt,vtt
-
- script-opts-append = uosc-curtain_opacity=0
+### https://github.com/hooke007/MPV_lazy/blob/main/portable_config/script-opts.conf
+
+##⇘⇘脚本选项
+
+
+##########
+# 控制台 #
+##########
+
+#script-opts-append = console-scale=1.2
+ script-opts-append = console-font=Ubuntu Mono
+ script-opts-append = console-font_size=20
+
+
+############
+# 统计数据 #
+############
+
+ script-opts-append = stats-duration=2
+ script-opts-append = stats-redraw_delay=0.5
+ script-opts-append = stats-persistent_overlay=yes
+ script-opts-append = stats-filter_params_max_length=1
+
+
+########
+# YTDL #
+########
+
+#script-opts-append = ytdl_hook-all_formats=yes
+#script-opts-append = ytdl_hook-force_all_formats=no
+#script-opts-append = ytdl_hook-use_manifests=yes
+
+#script-opts-append = ytdl_path=youtube-dl
+
+
+######################
+# 保存全局属性并恢复 #
+######################
+
+ script-opts-append = save_global_props-props=volume,glsl-shaders
+#script-opts-append = save_global_props-cache_dir=~~/
+
+
+################
+# 新缩略图引擎 #
+################
+
+ script-opts-append = thumbfast-min_duration=30
+#script-opts-append = thumbfast-precise=yes
+#script-opts-append = thumbfast-hwdec=no
+
+
+##################
+# 多功能控制界面 #
+##################
+
+#script-opts-append = uosc-timeline_size_min=0
+#script-opts-append = uosc-timeline_size_min_fullscreen=4
+
+#script-opts-append = uosc-autoload=yes
+
+#script-opts-append = uosc-ui_scale=2
+#script-opts-append = uosc-click_threshold=1000
+ script-opts-append = uosc-media_types=aac,ape,avi,dsf,dts,flac,flv,m2ts,m4a,m4v,mka,mkv,mov,mp3,mp4,mpeg,mpg,ogg,ogv,opus,rm,rmvb,ts,vob,wav,webm,wma,wmv,wv
+ script-opts-append = uosc-subtitle_types=ass,idx,lrc,mks,pgs,sup,srt,ssa,txt,vtt
+
+ script-opts-append = uosc-curtain_opacity=0
diff --git a/portable_config/vs/rife_cuda.vpy → portable_config/shaders/AMD_FSR.glsl b/portable_config/vs/rife_cuda.vpy → portable_config/shaders/AMD_FSR.glsl
diff --git a/portable_config/shaders/AMD_FSR_rgb.glsl b/portable_config/shaders/AMD_FSR_rgb.glsl
diff --git a/portable_config/shaders/nnedi3_nns128_win8x4.glsl b/portable_config/shaders/nnedi3_nns128_win8x4.glsl
diff --git a/portable_config/shaders/nnedi3_nns128_win8x6.glsl b/portable_config/shaders/nnedi3_nns128_win8x6.glsl
diff --git a/portable_config/vs/mvtools_2x.vpy b/portable_config/vs/mvtools_2x.vpy
diff --git a/portable_config/vs/mvtools_Pot.vpy b/portable_config/vs/mvtools_Pot.vpy
diff --git a/portable_config/vs/mvtools_std.vpy b/portable_config/vs/mvtools_std.vpy