Update 2021-01-21T18:33:10Z

3 files changed, 50 insertions, 16 deletions

diff --git a/.config/mpv/config b/.config/mpv/config
index 3491d76..8d6ac1a 100644
--- a/.config/mpv/config
+++ b/.config/mpv/config
@@ -4,12 +4,15 @@
 autoload-files=no
 input-ipc-server=/var/run/user/1000/mpv 
 profile=gpu-hq
+icc-profile=~~/B140QAN02_0.icm
+tone-mapping=clip
+target-peak=500
 
 #
 # Video
 #
-framedrop=vo
-video-sync=display-resample
+# framedrop=vo
+# video-sync=display-resample
 gpu-context=wayland
 window-maximized=yes # prevent wayland problems with buffer resize
 hwdec=yes
@@ -115,21 +118,39 @@ dscale=ewa_lanczossharp
 correct-downscaling=yes
 sigmoid-upscaling=yes
 
-[gpuscale8]
-profile-desc="Use GLSL shaders to scale via GPU"
+[gpuscale]
+profile-desc="Use GLSL shaders to scale via GPU (FSRCNNX)"
 profile=gpu-hq
-glsl-shaders=~~/shaders/FSRCNNX_x2_16-0-4-1.glsl
+hwdec=auto-copy
+gpu-api=opengl
+fbo-format=rgba16f
+cscale=mitchell
+dscale=mitchell
+linear-downscaling=no
+glsl-shaders-clr
+glsl-shaders=~~/shaders/default-shader-pack/shaders/FSRCNNX_x2_8-0-4-1.glsl
+glsl-shaders=~~/shaders/default-shader-pack/shaders/KrigBilateral.glsl
+glsl-shaders=~~/shaders/default-shader-pack/shaders/SSimDownscaler.glsl
 
-[gpuscale16]
-profile-desc="Use GLSL shaders to scale via GPU"
+[gpuscale-high]
+profile-desc="Use GLSL shaders to scale via GPU (FSRCNNX x16)"
 profile=gpu-hq
-glsl-shaders=~~/shaders/FSRCNNX_x2_8-0-4-1.glsl
+hwdec=auto-copy
+gpu-api=opengl
+fbo-format=rgba16f
+cscale=mitchell
+dscale=mitchell
+linear-downscaling=no
+glsl-shaders-clr
+glsl-shaders=~~/shaders/default-shader-pack/shaders/FSRCNNX_x2_16-0-4-1.glsl
+glsl-shaders=~~/shaders/default-shader-pack/shaders/KrigBilateral.glsl
+glsl-shaders=~~/shaders/default-shader-pack/shaders/SSimDownscaler.glsl
 
 [interpolate]
 profile-desc="Increase framecount by interpolating (with vapoursynth)"
 profile=gpu-hq
 vf=format=yuv420p,scale=w=-1:h=720,vapoursynth=~~/vapoursynth/interpolate.vpy:4:4
-video-sync=display-desync
+video-sync=display-resample
 
 [svp]
 profile-desc="[irrelevant] Integrate with SVP"
@@ -157,3 +178,11 @@ vf-add='stereo3d:ab2l:ml'
 [skip-silence]
 profile-desc="Skip over silent parts"
 af-add='silenceremove=0:0:0:-1:0.001:-45dB:0:rms'
+
+[anime4k]
+profile-desc="Anime4K x2 Perceptual"
+glsl-shaders-clr
+glsl-shaders=~~/shaders/default-shader-pack/shaders/Anime4K_3.0_Upscale_CNN_M_x2_Deblur.glsl
+glsl-shaders=~~/shaders/default-shader-pack/shaders/Anime4K_3.0_ThinLines_HQ.glsl
+glsl-shaders=~~/shaders/default-shader-pack/shaders/Anime4K_3.0_DarkLines_HQ.glsl
+glsl-shaders=~~/shaders/default-shader-pack/shaders/Anime4K_3.0_Denoise_Bilateral_Mode.glsl
diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf
index 67ace36..259eafc 100644
--- a/.config/mpv/input.conf
+++ b/.config/mpv/input.conf
@@ -99,6 +99,7 @@ h cycle-values af lavfi=[bs2b=profile=default] lavfi=[bs2b=profile=jmeier] lavfi
 
 MBTN_RIGHT script_binding uosc/menu
 U script_binding uosc/menu
+Enter script_binding uosc/menu
 P script-binding uosc/playlist  #! select > playlist
 C script-binding uosc/chapters  #! select > chapters
 Ctrl+space script-binding uosc/peek-timeline
@@ -110,7 +111,7 @@ Alt+r script-binding slicing/slicing_mark      #! utils > slicing > mark
 Alt+t script-binding autodeint                 #! utils > autodeint
 Alt+y script-binding autocrop/toggle_crop      #! utils > autocrop
 c script-binding contact-sheet-toggle          #! utils > contact sheet
-g script-binding playlist-view-toggle          #! utils > playlist view
+# g script-binding playlist-view-toggle          #! utils > playlist view
 Alt+m script-binding mouse_coords              #! utils > mouse coords
 
 K ignore
@@ -126,8 +127,12 @@ J ignore
 8 ignore
 9 ignore
 
-Ctrl+Shift+1 apply-profile anime       # ! profile > anime
-Ctrl+Shift+2 apply-profile cache       # ! profile > cache
-Ctrl+Shift+3 apply-profile scale       # ! profile > scale
-Ctrl+Shift+4 apply-profile interpolate # ! profile > interpolate
-Ctrl+Shift+5 apply-profile 3d          # ! profile > 3d fix
+Ctrl+Shift+0 apply-profile reset         #! profiles > reset
+Ctrl+Shift+1 apply-profile anime         #! profiles > anime
+Ctrl+Shift+2 apply-profile cache         #! profiles > cache
+Ctrl+Shift+3 apply-profile scale         #! profiles > scale
+Ctrl+Shift+4 apply-profile interpolate   #! profiles > interpolate
+Ctrl+Shift+5 apply-profile 3d            #! profiles > 3d fix
+Ctrl+Shift+6 apply-profile anime4k       #! profiles > 3d fix
+Ctrl+Shift+7 apply-profile gpuscale      #! profiles > gpuscale x8
+Ctrl+Shift+8 apply-profile gpuscale-high #! profiles > gpuscale x16
diff --git a/.config/mpv/scripts/mouse_coords.lua b/.config/mpv/scripts/mouse_coords.lua
index dae6239..3bc59b9 100644
--- a/.config/mpv/scripts/mouse_coords.lua
+++ b/.config/mpv/scripts/mouse_coords.lua
@@ -21,7 +21,7 @@ local msg = require('mp.msg')
 
 function print_pos()
     x, y = mp.get_mouse_pos()
-    pos = "x: " .. x .. ", y: " .. y
+    pos = "xy: " .. x .. "," .. y
     mp.msg.warn(pos)
     mp.osd_message(pos)
 end