diff --git a/HISTORY.md b/HISTORY.md index 4496290..236232f 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,12 @@ +_Version 1.2.1 (Sept 27, 2023)_ +- Split shaders into two sets (big improvement to quality of GPU shaders) + - NVidia + - AMD and Intel +- Improved `input.conf` + - new keys for playback speed + - upscaler shader mode + _Version 1.1.25 (Aug 13, 2023)_ - Fixed all console messages and implemented stricter MPV pathing for HOME_PATH - Improved optional `input.conf` with quiet mode seeking and other minor changes diff --git a/LICENSE b/LICENSE index 54d6b8f..bb9f3ac 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Dean +Copyright (c) 2019-2023 Dean Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index e288d0b..df5a6fb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # better-mpv-config -- Version: 1.1.25 -- Last Updated (AEST): 2023-08-13 06:38:55PM +- Version: 1.2.1 +- Last Updated (AEST): 2023-09-27 12:53:18AM - Target Platform: Windows 10 (not tested on Apple or Linux at all) - Test PC: Old Quad Core Desktop - CPU: Intel(R) Core(TM) i5-4690 CPU @ 3.50GHz @@ -11,6 +11,14 @@ ## What's New +_Version 1.2.1 (Sept 27, 2023)_ +- Split shaders into two sets (big improvement to quality of GPU shaders) + - NVidia + - AMD and Intel +- Improved `input.conf` + - new keys for playback speed + - upscaler shader mode + _Version 1.1.25 (Aug 13, 2023)_ - Fixed all console messages and implemented stricter MPV pathing for HOME_PATH - Improved optional `input.conf` with quiet mode seeking and other minor changes diff --git a/mpv_v3/configs/mpv_amd_or_intel_gpu.conf b/mpv_v3/configs/mpv_amd_or_intel_gpu.conf index a1fe0f7..bb55dc6 100644 --- a/mpv_v3/configs/mpv_amd_or_intel_gpu.conf +++ b/mpv_v3/configs/mpv_amd_or_intel_gpu.conf @@ -2,3 +2,20 @@ # TESTING - AMD and Intel # hwdec=vaapi + +# ===== GPU shaders ===== +# REF: https://gist.github.com/agyild +# Note: Upscales and improves videos that have a video frame height less than 1080. +# Videos 1080p and higher do not use these shaders. +# If using my custom input.conf the keybind to apply it is 'F9' + +[upscale-lowres-using-GPU-shaders] +profile-desc=Upscales low resolution videos using GPU upscaling shaders. +profile-cond=height < 1080 + +# FidelityFX CAS - Sharpening shader that provides an even level of sharpness across the frame. +glsl-shaders-append="~~/shaders/CAS.glsl" # https://gist.github.com/agyild/bbb4e58298b2f86aa24da3032a0d2ee6 + +# AMD FidelityFX Super Resolution - A spatial upscaler which provides consistent upscaling quality +# regardless of whether the frame is in movement. +glsl-shaders-append="~~/shaders/FSR.glsl" # https://gist.github.com/agyild/82219c545228d70c5604f865ce0b0ce5 diff --git a/mpv_v3/configs/mpv_nvidia_gpu.conf b/mpv_v3/configs/mpv_nvidia_gpu.conf index 6172102..e315f1c 100644 --- a/mpv_v3/configs/mpv_nvidia_gpu.conf +++ b/mpv_v3/configs/mpv_nvidia_gpu.conf @@ -2,3 +2,17 @@ # TESTING - NVidia # hwdec=nvdec + +# ===== GPU shaders ===== +# REF: https://gist.github.com/agyild +# Note: Upscales and improves videos that have a video frame height less than 1080. +# Videos 1080p and higher do not use these shaders. +# If using my custom input.conf the keybind to apply it is 'F9' + +[upscale-lowres-using-GPU-shaders] +profile-desc=Upscales low resolution videos using GPU upscaling shaders. +profile-cond=height < 1080 + +# Adaptive-directional sharpening algorithm shaders for NVidia GPUs. +glsl-shaders-append="~~/shaders/NVScaler.glsl" # https://gist.github.com/agyild/7e8951915b2bf24526a9343d951db214 +glsl-shaders-append="~~/shaders/NVSharpen.glsl" # https://gist.github.com/agyild/7e8951915b2bf24526a9343d951db214 diff --git a/mpv_v3/configs/mpv_shaders.conf b/mpv_v3/configs/mpv_shaders.conf index d28a436..583f432 100644 --- a/mpv_v3/configs/mpv_shaders.conf +++ b/mpv_v3/configs/mpv_shaders.conf @@ -15,23 +15,3 @@ glsl-shaders-append="~~/shaders/SSimSuperRes.glsl" # https://gist.github.com/igv # KrigBilateral: Chroma scaler that uses luma information for high quality upscaling. glsl-shaders-append="~~/shaders/KrigBilateral.glsl" # https://gist.github.com/igv/a015fc885d5c22e6891820ad89555637 - -# ===== GPU shaders ===== -# REF: https://gist.github.com/agyild -# Note: Upscales and improves videos that have a video frame height less than 1080. -# Videos 1080p and higher do not use these shaders. - -[upscale-lowres-using-GPU-shaders] -profile-desc=Upscales low resolution videos using GPU upscaling shaders. -profile-cond=height < 1080 - -# Adaptive-directional sharpening algorithm shaders. -glsl-shaders-append="~~/shaders/NVScaler.glsl" # https://gist.github.com/agyild/7e8951915b2bf24526a9343d951db214 -glsl-shaders-append="~~/shaders/NVSharpen.glsl" # https://gist.github.com/agyild/7e8951915b2bf24526a9343d951db214 - -# FidelityFX CAS - Sharpening shader that provides an even level of sharpness across the frame. -glsl-shaders-append="~~/shaders/CAS.glsl" # https://gist.github.com/agyild/bbb4e58298b2f86aa24da3032a0d2ee6 - -# AMD FidelityFX Super Resolution - A spatial upscaler which provides consistent upscaling quality -# regardless of whether the frame is in movement. -glsl-shaders-append="~~/shaders/FSR.glsl" # https://gist.github.com/agyild/82219c545228d70c5604f865ce0b0ce5 diff --git a/mpv_v3/input.conf b/mpv_v3/input.conf index b6e3198..0b73a55 100644 --- a/mpv_v3/input.conf +++ b/mpv_v3/input.conf @@ -1,6 +1,6 @@ -# MPV v3 Input Configuration - version 1.1.25 -# Date: 2023-08-30 11:10:52AM +# MPV v3 Input Configuration - version 1.2.1 +# Date: 2023-09-27 12:53:18AM # MPV Keys: https://mpv.io/manual/stable/#key-names @@ -214,12 +214,14 @@ META+BS set video-zoom 0 ; show-text "Zoom resetted" -# [F1] F2 F3 F4 F5 F6 F7 F8 F9 F10 F11 [F12] +# [F1] F2 F3 F4 F5 F6 F7 [F8] [F9] [F10] [F11] [F12] F1 script-binding console/enable -F10 cycle-values speed 0.8 0.6 0.4 0.2 1 # Slow speed -F11 cycle-values speed 1.2 1.4 1.6 1.8 2 1 # Faster speed -F12 af toggle "lavfi=[loudnorm=I=-22:TP=-1.5:LRA=2]" # Useful audio normalization for low-audio or whispering scenes +F8 vf toggle "interpolation=yes,tscale=oversample" ; show-text "Toggled Realtime Motion Interpolation (native) [interpolation=yes,tscale=oversample]" # Soap-opera effect for frame smoothing +F9 apply-profile "upscale-lowres-using-GPU-shaders" ; show-text "Applied GPU upscaler shaders" +F10 cycle-values speed 0.8 0.6 0.4 0.2 1 # Slow speed +F11 cycle-values speed 1.2 1.4 1.6 1.8 2 1 # Faster speed +F12 af toggle "lavfi=[loudnorm=I=-22:TP=-1.5:LRA=2]" # Useful audio normalization for low-audio or whispering scenes (can cause annoying background noise amplification) # Numpad @@ -236,10 +238,10 @@ KP9 ignore KP_DEC ignore KP_ENTER ignore -# Testing at 2023-08-30 11:11:39AM +# Testing at 2023-09-27 12:46:12AM # Show Loaded Shaders (for dev testing) -# ` script-binding sview/shader-view +` script-binding sview/shader-view # Show progress bar on MOUSE BUTTON 2 double-click # MOUSE_BTN2_DBL show-progress diff --git a/mpv_v3/mpv.conf b/mpv_v3/mpv.conf index b3889d6..2d789f9 100644 --- a/mpv_v3/mpv.conf +++ b/mpv_v3/mpv.conf @@ -1,6 +1,6 @@ -# MPV v3 Config - version 1.1.25 -# Date: 2023-08-13 06:24:54PM +# MPV v3 Config - version 1.2.1 +# Date: 2023-09-27 12:53:18AM # REF: https://github.com/Argon-/mpv-config/blob/master/mpv.conf # REF: https://github.com/Zabooby/mpv-config