diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index c62787b..419f5d8 100755 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -9,13 +9,13 @@ #catmull_rom = bicubic b 0 c 0.5 #hermite = bicubic b 0 c 0 -scale=catmull_rom +scale=lanczos #dscale, like scale, but for downscaling, #it defaults to scale if unset -#Due to not having a negative lobe, mitchell and hermite are -#much better for downscaling (less ringing and aliasing). +#Due to not having a negative lobe, hermite is better for +#downscaling (less ringing and aliasing), mitchell could work too #hermite is sharper than mitchell #https://github.com/mpv-player/mpv/pull/12384#issuecomment-1716775594 #https://github.com/mpv-player/mpv/pull/12384#issuecomment-1716855374 @@ -23,11 +23,11 @@ scale=catmull_rom dscale=hermite -#'catmull_rom', 'sinc(blackman)', 'lanczos', 'ewa_hanning', 'ewa_lanczossharp' +#'catmull_rom', 'sinc(blackman window)', hanning 'lanczos' #For a traditional scaler, is better to use sinc, but it has more resource usage than catmull_rom. -cscale=sinc -cscale-window=blackman #for sinc -cscale-radius=3 #for sinc +cscale=catmull_rom +#cscale-window=blackman #for sinc +#cscale-radius=3 #taps for sinc #https://github.com/mpv-player/mpv/issues/12163 #you can also use 'FastBilateral', 'JointBilateral', 'MemeBilateral' or KrigBilateral @@ -42,6 +42,12 @@ cscale-radius=3 #for sinc #intended the chroma to be watched, if you believe them or not is up to you. +#can decrease performance depending on scalers, more noticeable on 4k content +correct-downscaling=yes + +#enabling them gives better quality with almost no performance impact +linear-downscaling=yes +sigmoid-upscaling=yes # AUDIO @@ -134,16 +140,18 @@ target-trc=srgb #you can leave it on 'auto', sdr is '203' target-peak=auto -hdr-compute-peak=yes +hdr-compute-peak=yes #uses own algorythm instead of metadata -allow-delayed-peak-detect=yes #better performance +allow-delayed-peak-detect=yes #enable for better performance #You can use 'spline' (probably better), 'bt.2390', 'bt.2446a' or leave it on 'auto'. tone-mapping=spline -#tone-mapping-param=1.5 #For bt.2390, mpv default 1.0 and some like 1.5, for spline default is 0.3 -hdr-peak-percentile=100 #better leave it at 100 +#tone-mapping-param=1.5 #For bt.2390, mpv default 1.0 and some like 1.5, for spline default is 0.3 + +hdr-peak-percentile=99.995 #use 99.995 for better hdr +#hdr-contrast-recovery=0.30 #better hdr, less performance #tone-mapping-mode=hybrid #deprecated https://github.com/mpv-player/mpv/commit/b4c98cb04c87999eccd061cc59e6f5f8fa706220 @@ -151,6 +159,7 @@ gamut-mapping-mode=perceptual icc-intent=0 + #blend-subtitles=yes @@ -173,7 +182,9 @@ vo=gpu-next hwdec=auto-safe #hwdec=auto-copy-safe #enables copyback -#hwdec=vulkan +#vulkan hwdec has better default hw deinterlacing (bwdif), +#you can still use bwdif without vulkan, using copyback. +#hwdec=vulkan #vulkan uses more resources,but has better hdr compatibility diff --git a/.config/mpv/shaders/CfL_Prediction.glsl b/.config/mpv/shaders/CfL_Prediction.glsl index 7bd8358..5c7093b 100755 --- a/.config/mpv/shaders/CfL_Prediction.glsl +++ b/.config/mpv/shaders/CfL_Prediction.glsl @@ -88,6 +88,7 @@ float comp_wd(vec2 distance) { vec4 hook() { float ar_strength = 0.75; + float mix_coeff = 0.5; vec4 output_pix = vec4(0.0, 0.0, 0.0, 1.0); float luma_zero = LUMA_texOff(0.0).x; @@ -242,9 +243,7 @@ vec4 hook() { #if (USE_12_TAP_REGRESSION == 1) vec2 alpha_12 = luma_chroma_cov_12 / max(luma_var_12, 1e-6); vec2 beta_12 = chroma_avg_12 - alpha_12 * luma_avg_12; - vec2 chroma_pred_12 = clamp(alpha_12 * luma_zero + beta_12, 0.0, 1.0); - chroma_pred_12 = mix(chroma_spatial, chroma_pred_12, pow(corr, vec2(2.0)) / 2.0); #endif #if (USE_4_TAP_REGRESSION == 1) float luma_avg_4 = 0.0; @@ -275,32 +274,17 @@ vec4 hook() { vec2 alpha_4 = luma_chroma_cov_4 / max(luma_var_4, 1e-4); vec2 beta_4 = chroma_avg_4 - alpha_4 * luma_avg_4; - vec2 chroma_pred_4 = clamp(alpha_4 * luma_zero + beta_4, 0.0, 1.0); - - if (chroma_min.x > 0.5) { - chroma_pred_4.x = clamp(chroma_pred_4.x, 0.5, 1.0); - } - if (chroma_min.y > 0.5) { - chroma_pred_4.y = clamp(chroma_pred_4.y, 0.5, 1.0); - } - if (chroma_max.x < 0.5) { - chroma_pred_4.x = clamp(chroma_pred_4.x, 0.0, 0.5); - } - if (chroma_max.y < 0.5) { - chroma_pred_4.y = clamp(chroma_pred_4.y, 0.0, 0.5); - } - chroma_pred_4 = mix(chroma_spatial, chroma_pred_4, pow(corr, vec2(2.0)) / 2.0); #endif #if (USE_12_TAP_REGRESSION == 1 && USE_4_TAP_REGRESSION == 1) - output_pix.xy = mix(chroma_pred_4, chroma_pred_12, 0.5); + output_pix.xy = mix(chroma_spatial, mix(chroma_pred_4, chroma_pred_12, 0.5), pow(corr, vec2(2.0)) * mix_coeff); #elif (USE_12_TAP_REGRESSION == 1 && USE_4_TAP_REGRESSION == 0) - output_pix.xy = chroma_pred_12; + output_pix.xy = mix(chroma_spatial, chroma_pred_12, pow(corr, vec2(2.0)) * mix_coeff); #elif (USE_12_TAP_REGRESSION == 0 && USE_4_TAP_REGRESSION == 1) - output_pix.xy = chroma_pred_4; + output_pix.xy = mix(chroma_spatial, chroma_pred_4, pow(corr, vec2(2.0)) * mix_coeff); #else output_pix.xy = chroma_spatial; #endif output_pix.xy = clamp(output_pix.xy, 0.0, 1.0); - return output_pix; + return output_pix; } diff --git a/.config/mpv/shaders/CfL_Prediction_12tap.glsl b/.config/mpv/shaders/CfL_Prediction_12tap.glsl deleted file mode 100755 index c6677d4..0000000 --- a/.config/mpv/shaders/CfL_Prediction_12tap.glsl +++ /dev/null @@ -1,215 +0,0 @@ -// MIT License - -// Copyright (c) 2023 João Chrisóstomo - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA -//!SAVE LUMA_LOWRES -//!WIDTH CHROMA.w -//!HEIGHT LUMA.h -//!WHEN CHROMA.w LUMA.w < -//!DESC Chroma From Luma Prediction (Downscaling Luma 1st Step) - -vec4 hook() { - float factor = ceil(LUMA_size.x / CHROMA_size.x); - int start = int(ceil(-factor - 0.5)); - int end = int(floor(factor - 0.5)); - float filter_end = float(end) + 1.5; - - float output_luma = 0.0; - float wt = 0.0; - for (int dx = start; dx <= end; dx++) { - float luma_pix = LUMA_texOff(vec2(dx + 0.5, 0.0)).x; - float wd = smoothstep(0.0, filter_end, filter_end - length(vec2(dx + 0.5, 0.0))); - output_luma += luma_pix * wd; - wt += wd; - } - vec4 output_pix = vec4(output_luma / wt, 0.0, 0.0, 1.0); - return output_pix; -} - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA_LOWRES -//!SAVE LUMA_LOWRES -//!WIDTH CHROMA.w -//!HEIGHT CHROMA.h -//!WHEN CHROMA.w LUMA.w < -//!DESC Chroma From Luma Prediction (Downscaling Luma 2nd Step) - -vec4 hook() { - float factor = ceil(LUMA_LOWRES_size.y / CHROMA_size.y); - int start = int(ceil(-factor - 0.5)); - int end = int(floor(factor - 0.5)); - float filter_end = float(end) + 1.5; - - float output_luma = 0.0; - float wt = 0.0; - for (int dy = start; dy <= end; dy++) { - float luma_pix = LUMA_LOWRES_texOff(vec2(0.0, dy + 0.5)).x; - float wd = smoothstep(0.0, filter_end, filter_end - length(vec2(0.0, dy + 0.5))); - output_luma += luma_pix * wd; - wt += wd; - } - vec4 output_pix = vec4(output_luma / wt, 0.0, 0.0, 1.0); - return output_pix; -} - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA -//!BIND LUMA_LOWRES -//!WHEN CHROMA.w LUMA.w < -//!WIDTH LUMA.w -//!HEIGHT LUMA.h -//!OFFSET ALIGN -//!DESC Chroma From Luma Prediction (12-tap, Upscaling Chroma) - -float comp_wd(vec2 distance) { - float d = min(length(distance), 2.0); - if (d < 1.0) { - return (6.0 + d * d * (-15.0 + d * 9.0)) / 6.0; - } else { - return (12.0 + d * (-24.0 + d * (15.0 + d * -3.0))) / 6.0; - } -} - -vec4 hook() { - float division_limit = 1e-4; - - vec4 output_pix = vec4(0.0, 0.0, 0.0, 1.0); - float luma_zero = LUMA_texOff(0.0).x; - - vec2 pp = CHROMA_pos * CHROMA_size - vec2(0.5); - vec2 fp = floor(pp); - pp -= fp; - - vec2 chroma_pixels[12]; - chroma_pixels[0] = CHROMA_tex(vec2((fp + vec2(0.5, -0.5)) * CHROMA_pt)).xy; - chroma_pixels[1] = CHROMA_tex(vec2((fp + vec2(1.5, -0.5)) * CHROMA_pt)).xy; - chroma_pixels[2] = CHROMA_tex(vec2((fp + vec2(-0.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[3] = CHROMA_tex(vec2((fp + vec2( 0.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[4] = CHROMA_tex(vec2((fp + vec2( 1.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[5] = CHROMA_tex(vec2((fp + vec2( 2.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[6] = CHROMA_tex(vec2((fp + vec2(-0.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[7] = CHROMA_tex(vec2((fp + vec2( 0.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[8] = CHROMA_tex(vec2((fp + vec2( 1.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[9] = CHROMA_tex(vec2((fp + vec2( 2.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[10] = CHROMA_tex(vec2((fp + vec2(0.5, 2.5) ) * CHROMA_pt)).xy; - chroma_pixels[11] = CHROMA_tex(vec2((fp + vec2(1.5, 2.5) ) * CHROMA_pt)).xy; - - float luma_pixels[12]; - luma_pixels[0] = LUMA_LOWRES_tex(vec2((fp + vec2(0.5, -0.5)) * CHROMA_pt)).x; - luma_pixels[1] = LUMA_LOWRES_tex(vec2((fp + vec2(1.5, -0.5)) * CHROMA_pt)).x; - luma_pixels[2] = LUMA_LOWRES_tex(vec2((fp + vec2(-0.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[3] = LUMA_LOWRES_tex(vec2((fp + vec2( 0.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[4] = LUMA_LOWRES_tex(vec2((fp + vec2( 1.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[5] = LUMA_LOWRES_tex(vec2((fp + vec2( 2.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[6] = LUMA_LOWRES_tex(vec2((fp + vec2(-0.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[7] = LUMA_LOWRES_tex(vec2((fp + vec2( 0.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[8] = LUMA_LOWRES_tex(vec2((fp + vec2( 1.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[9] = LUMA_LOWRES_tex(vec2((fp + vec2( 2.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[10] = LUMA_LOWRES_tex(vec2((fp + vec2(0.5, 2.5) ) * CHROMA_pt)).x; - luma_pixels[11] = LUMA_LOWRES_tex(vec2((fp + vec2(1.5, 2.5) ) * CHROMA_pt)).x; - - vec2 chroma_min = vec2(1e8); - chroma_min = min(chroma_min, chroma_pixels[3]); - chroma_min = min(chroma_min, chroma_pixels[4]); - chroma_min = min(chroma_min, chroma_pixels[7]); - chroma_min = min(chroma_min, chroma_pixels[8]); - - vec2 chroma_max = vec2(1e-8); - chroma_max = max(chroma_max, chroma_pixels[3]); - chroma_max = max(chroma_max, chroma_pixels[4]); - chroma_max = max(chroma_max, chroma_pixels[7]); - chroma_max = max(chroma_max, chroma_pixels[8]); - - float wd[12]; - wd[0] = comp_wd(vec2( 0.0,-1.0) - pp); - wd[1] = comp_wd(vec2( 1.0,-1.0) - pp); - wd[2] = comp_wd(vec2(-1.0, 0.0) - pp); - wd[3] = comp_wd(vec2( 0.0, 0.0) - pp); - wd[4] = comp_wd(vec2( 1.0, 0.0) - pp); - wd[5] = comp_wd(vec2( 2.0, 0.0) - pp); - wd[6] = comp_wd(vec2(-1.0, 1.0) - pp); - wd[7] = comp_wd(vec2( 0.0, 1.0) - pp); - wd[8] = comp_wd(vec2( 1.0, 1.0) - pp); - wd[9] = comp_wd(vec2( 2.0, 1.0) - pp); - wd[10] = comp_wd(vec2( 0.0, 2.0) - pp); - wd[11] = comp_wd(vec2( 1.0, 2.0) - pp); - - float wt = 0.0; - for (int i = 0; i < 12; i++) { - wt += wd[i]; - } - - vec2 ct = vec2(0.0); - for (int i = 0; i < 12; i++) { - ct += wd[i] * chroma_pixels[i]; - } - - vec2 chroma_spatial = ct / wt; - chroma_spatial = clamp(chroma_spatial, chroma_min, chroma_max); - - float luma_avg_12 = 0.0; - for(int i = 0; i < 12; i++) { - luma_avg_12 += luma_pixels[i]; - } - luma_avg_12 /= 12.0; - - float luma_var_12 = 0.0; - for(int i = 0; i < 12; i++) { - luma_var_12 += pow(luma_pixels[i] - luma_avg_12, 2.0); - } - - vec2 chroma_avg_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_avg_12 += chroma_pixels[i]; - } - chroma_avg_12 /= 12.0; - - vec2 chroma_var_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_var_12 += pow(chroma_pixels[i] - chroma_avg_12, vec2(2.0)); - } - - vec2 luma_chroma_cov_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - luma_chroma_cov_12 += (luma_pixels[i] - luma_avg_12) * (chroma_pixels[i] - chroma_avg_12); - } - - vec2 corr = abs(luma_chroma_cov_12 / max(sqrt(luma_var_12 * chroma_var_12), division_limit)); - corr = clamp(corr, 0.0, 1.0); - - vec2 alpha_12 = luma_chroma_cov_12 / max(luma_var_12, division_limit); - vec2 beta_12 = chroma_avg_12 - alpha_12 * luma_avg_12; - - vec2 chroma_pred_12 = alpha_12 * luma_zero + beta_12; - chroma_pred_12 = clamp(chroma_pred_12, 0.0, 1.0); - - output_pix.xy = mix(chroma_spatial, chroma_pred_12, pow(corr, vec2(2.0)) / 2.0); - - // Replace this with chroma_min and chroma_max if you want AR - // output_pix.yz = clamp(output_pix.yz, chroma_min, chroma_max); - output_pix.xy = clamp(output_pix.xy, 0.0, 1.0); - return output_pix; -} \ No newline at end of file diff --git a/.config/mpv/shaders/CfL_Prediction_4tap.glsl b/.config/mpv/shaders/CfL_Prediction_4tap.glsl deleted file mode 100755 index c0b3aab..0000000 --- a/.config/mpv/shaders/CfL_Prediction_4tap.glsl +++ /dev/null @@ -1,241 +0,0 @@ -// MIT License - -// Copyright (c) 2023 João Chrisóstomo - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA -//!SAVE LUMA_LOWRES -//!WIDTH CHROMA.w -//!HEIGHT LUMA.h -//!WHEN CHROMA.w LUMA.w < -//!DESC Chroma From Luma Prediction (Downscaling Luma 1st Step) - -vec4 hook() { - float factor = ceil(LUMA_size.x / CHROMA_size.x); - int start = int(ceil(-factor - 0.5)); - int end = int(floor(factor - 0.5)); - float filter_end = float(end) + 1.5; - - float output_luma = 0.0; - float wt = 0.0; - for (int dx = start; dx <= end; dx++) { - float luma_pix = LUMA_texOff(vec2(dx + 0.5, 0.0)).x; - float wd = smoothstep(0.0, filter_end, filter_end - length(vec2(dx + 0.5, 0.0))); - output_luma += luma_pix * wd; - wt += wd; - } - vec4 output_pix = vec4(output_luma / wt, 0.0, 0.0, 1.0); - return output_pix; -} - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA_LOWRES -//!SAVE LUMA_LOWRES -//!WIDTH CHROMA.w -//!HEIGHT CHROMA.h -//!WHEN CHROMA.w LUMA.w < -//!DESC Chroma From Luma Prediction (Downscaling Luma 2nd Step) - -vec4 hook() { - float factor = ceil(LUMA_LOWRES_size.y / CHROMA_size.y); - int start = int(ceil(-factor - 0.5)); - int end = int(floor(factor - 0.5)); - float filter_end = float(end) + 1.5; - - float output_luma = 0.0; - float wt = 0.0; - for (int dy = start; dy <= end; dy++) { - float luma_pix = LUMA_LOWRES_texOff(vec2(0.0, dy + 0.5)).x; - float wd = smoothstep(0.0, filter_end, filter_end - length(vec2(0.0, dy + 0.5))); - output_luma += luma_pix * wd; - wt += wd; - } - vec4 output_pix = vec4(output_luma / wt, 0.0, 0.0, 1.0); - return output_pix; -} - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA -//!BIND LUMA_LOWRES -//!WHEN CHROMA.w LUMA.w < -//!WIDTH LUMA.w -//!HEIGHT LUMA.h -//!OFFSET ALIGN -//!DESC Chroma From Luma Prediction (4-tap, Upscaling Chroma) - -float comp_wd(vec2 distance) { - float d = min(length(distance), 2.0); - if (d < 1.0) { - return (6.0 + d * d * (-15.0 + d * 9.0)) / 6.0; - } else { - return (12.0 + d * (-24.0 + d * (15.0 + d * -3.0))) / 6.0; - } -} - -vec4 hook() { - float division_limit = 1e-4; - - vec4 output_pix = vec4(0.0, 0.0, 0.0, 1.0); - float luma_zero = LUMA_texOff(0.0).x; - - vec2 pp = CHROMA_pos * CHROMA_size - vec2(0.5); - vec2 fp = floor(pp); - pp -= fp; - - vec2 chroma_pixels[12]; - chroma_pixels[0] = CHROMA_tex(vec2((fp + vec2(0.5, -0.5)) * CHROMA_pt)).xy; - chroma_pixels[1] = CHROMA_tex(vec2((fp + vec2(1.5, -0.5)) * CHROMA_pt)).xy; - chroma_pixels[2] = CHROMA_tex(vec2((fp + vec2(-0.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[3] = CHROMA_tex(vec2((fp + vec2( 0.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[4] = CHROMA_tex(vec2((fp + vec2( 1.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[5] = CHROMA_tex(vec2((fp + vec2( 2.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[6] = CHROMA_tex(vec2((fp + vec2(-0.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[7] = CHROMA_tex(vec2((fp + vec2( 0.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[8] = CHROMA_tex(vec2((fp + vec2( 1.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[9] = CHROMA_tex(vec2((fp + vec2( 2.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[10] = CHROMA_tex(vec2((fp + vec2(0.5, 2.5) ) * CHROMA_pt)).xy; - chroma_pixels[11] = CHROMA_tex(vec2((fp + vec2(1.5, 2.5) ) * CHROMA_pt)).xy; - - float luma_pixels[12]; - luma_pixels[0] = LUMA_LOWRES_tex(vec2((fp + vec2(0.5, -0.5)) * CHROMA_pt)).x; - luma_pixels[1] = LUMA_LOWRES_tex(vec2((fp + vec2(1.5, -0.5)) * CHROMA_pt)).x; - luma_pixels[2] = LUMA_LOWRES_tex(vec2((fp + vec2(-0.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[3] = LUMA_LOWRES_tex(vec2((fp + vec2( 0.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[4] = LUMA_LOWRES_tex(vec2((fp + vec2( 1.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[5] = LUMA_LOWRES_tex(vec2((fp + vec2( 2.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[6] = LUMA_LOWRES_tex(vec2((fp + vec2(-0.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[7] = LUMA_LOWRES_tex(vec2((fp + vec2( 0.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[8] = LUMA_LOWRES_tex(vec2((fp + vec2( 1.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[9] = LUMA_LOWRES_tex(vec2((fp + vec2( 2.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[10] = LUMA_LOWRES_tex(vec2((fp + vec2(0.5, 2.5) ) * CHROMA_pt)).x; - luma_pixels[11] = LUMA_LOWRES_tex(vec2((fp + vec2(1.5, 2.5) ) * CHROMA_pt)).x; - - vec2 chroma_min = vec2(1e8); - chroma_min = min(chroma_min, chroma_pixels[3]); - chroma_min = min(chroma_min, chroma_pixels[4]); - chroma_min = min(chroma_min, chroma_pixels[7]); - chroma_min = min(chroma_min, chroma_pixels[8]); - - vec2 chroma_max = vec2(1e-8); - chroma_max = max(chroma_max, chroma_pixels[3]); - chroma_max = max(chroma_max, chroma_pixels[4]); - chroma_max = max(chroma_max, chroma_pixels[7]); - chroma_max = max(chroma_max, chroma_pixels[8]); - - float wd[12]; - wd[0] = comp_wd(vec2( 0.0,-1.0) - pp); - wd[1] = comp_wd(vec2( 1.0,-1.0) - pp); - wd[2] = comp_wd(vec2(-1.0, 0.0) - pp); - wd[3] = comp_wd(vec2( 0.0, 0.0) - pp); - wd[4] = comp_wd(vec2( 1.0, 0.0) - pp); - wd[5] = comp_wd(vec2( 2.0, 0.0) - pp); - wd[6] = comp_wd(vec2(-1.0, 1.0) - pp); - wd[7] = comp_wd(vec2( 0.0, 1.0) - pp); - wd[8] = comp_wd(vec2( 1.0, 1.0) - pp); - wd[9] = comp_wd(vec2( 2.0, 1.0) - pp); - wd[10] = comp_wd(vec2( 0.0, 2.0) - pp); - wd[11] = comp_wd(vec2( 1.0, 2.0) - pp); - - float wt = 0.0; - for (int i = 0; i < 12; i++) { - wt += wd[i]; - } - - vec2 ct = vec2(0.0); - for (int i = 0; i < 12; i++) { - ct += wd[i] * chroma_pixels[i]; - } - - vec2 chroma_spatial = ct / wt; - chroma_spatial = clamp(chroma_spatial, chroma_min, chroma_max); - - float luma_avg_4 = 0.0; - luma_avg_4 += luma_pixels[3]; - luma_avg_4 += luma_pixels[4]; - luma_avg_4 += luma_pixels[7]; - luma_avg_4 += luma_pixels[8]; - luma_avg_4 /= 4.0; - - float luma_var_4 = 0.0; - luma_var_4 += pow(luma_pixels[3] - luma_avg_4, 2.0); - luma_var_4 += pow(luma_pixels[4] - luma_avg_4, 2.0); - luma_var_4 += pow(luma_pixels[7] - luma_avg_4, 2.0); - luma_var_4 += pow(luma_pixels[8] - luma_avg_4, 2.0); - - vec2 chroma_avg_4 = vec2(0.0); - chroma_avg_4 += chroma_pixels[3]; - chroma_avg_4 += chroma_pixels[4]; - chroma_avg_4 += chroma_pixels[7]; - chroma_avg_4 += chroma_pixels[8]; - chroma_avg_4 /= 4.0; - - vec2 luma_chroma_cov_4 = vec2(0.0); - luma_chroma_cov_4 += (luma_pixels[3] - luma_avg_4) * (chroma_pixels[3] - chroma_avg_4); - luma_chroma_cov_4 += (luma_pixels[4] - luma_avg_4) * (chroma_pixels[4] - chroma_avg_4); - luma_chroma_cov_4 += (luma_pixels[7] - luma_avg_4) * (chroma_pixels[7] - chroma_avg_4); - luma_chroma_cov_4 += (luma_pixels[8] - luma_avg_4) * (chroma_pixels[8] - chroma_avg_4); - - vec2 alpha_4 = luma_chroma_cov_4 / max(luma_var_4, division_limit); - vec2 beta_4 = chroma_avg_4 - alpha_4 * luma_avg_4; - - vec2 chroma_pred_4 = alpha_4 * luma_zero + beta_4; - chroma_pred_4 = clamp(chroma_pred_4, 0.0, 1.0); - - float luma_avg_12 = 0.0; - for(int i = 0; i < 12; i++) { - luma_avg_12 += luma_pixels[i]; - } - luma_avg_12 /= 12.0; - - float luma_var_12 = 0.0; - for(int i = 0; i < 12; i++) { - luma_var_12 += pow(luma_pixels[i] - luma_avg_12, 2.0); - } - - vec2 chroma_avg_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_avg_12 += chroma_pixels[i]; - } - chroma_avg_12 /= 12.0; - - vec2 chroma_var_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_var_12 += pow(chroma_pixels[i] - chroma_avg_12, vec2(2.0)); - } - - vec2 luma_chroma_cov_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - luma_chroma_cov_12 += (luma_pixels[i] - luma_avg_12) * (chroma_pixels[i] - chroma_avg_12); - } - - vec2 corr = abs(luma_chroma_cov_12 / max(sqrt(luma_var_12 * chroma_var_12), division_limit)); - corr = clamp(corr, 0.0, 1.0); - - output_pix.xy = mix(chroma_spatial, chroma_pred_4, pow(corr, vec2(2.0)) / 2.0); - - // Replace this with chroma_min and chroma_max if you want AR - // output_pix.yz = clamp(output_pix.yz, chroma_min, chroma_max); - output_pix.xy = clamp(output_pix.xy, 0.0, 1.0); - return output_pix; -} \ No newline at end of file diff --git a/.config/mpv/shaders/CfL_Prediction_native.glsl b/.config/mpv/shaders/CfL_Prediction_native.glsl deleted file mode 100755 index e654034..0000000 --- a/.config/mpv/shaders/CfL_Prediction_native.glsl +++ /dev/null @@ -1,197 +0,0 @@ -// MIT License - -// Copyright (c) 2023 João Chrisóstomo - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA -//!SAVE LUMA_LOWRES -//!WIDTH CHROMA.w -//!HEIGHT LUMA.h -//!WHEN CHROMA.w LUMA.w < -//!DESC Chroma From Luma Prediction (Downscaling Luma 1st Step) - -vec4 hook() { - float factor = ceil(LUMA_size.x / CHROMA_size.x); - int start = int(ceil(-factor - 0.5)); - int end = int(floor(factor - 0.5)); - float filter_end = float(end) + 1.5; - - float output_luma = 0.0; - float wt = 0.0; - for (int dx = start; dx <= end; dx++) { - float luma_pix = LUMA_texOff(vec2(dx + 0.5, 0.0)).x; - float wd = smoothstep(0.0, filter_end, filter_end - length(vec2(dx + 0.5, 0.0))); - output_luma += luma_pix * wd; - wt += wd; - } - vec4 output_pix = vec4(output_luma / wt, 0.0, 0.0, 1.0); - return output_pix; -} - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA_LOWRES -//!SAVE LUMA_LOWRES -//!WIDTH CHROMA.w -//!HEIGHT CHROMA.h -//!WHEN CHROMA.w LUMA.w < -//!DESC Chroma From Luma Prediction (Downscaling Luma 2nd Step) - -vec4 hook() { - float factor = ceil(LUMA_LOWRES_size.y / CHROMA_size.y); - int start = int(ceil(-factor - 0.5)); - int end = int(floor(factor - 0.5)); - float filter_end = float(end) + 1.5; - - float output_luma = 0.0; - float wt = 0.0; - for (int dy = start; dy <= end; dy++) { - float luma_pix = LUMA_LOWRES_texOff(vec2(0.0, dy + 0.5)).x; - float wd = smoothstep(0.0, filter_end, filter_end - length(vec2(0.0, dy + 0.5))); - output_luma += luma_pix * wd; - wt += wd; - } - vec4 output_pix = vec4(output_luma / wt, 0.0, 0.0, 1.0); - return output_pix; -} - -//!HOOK NATIVE -//!BIND LUMA_LOWRES -//!BIND CHROMA -//!BIND NATIVE -//!OFFSET ALIGN -//!WHEN CHROMA.w LUMA.w < -//!DESC Chroma From Luma Prediction (Upscaling Chroma) - -vec4 hook() { - float division_limit = 1e-4; - - vec4 output_pix = NATIVE_texOff(0.0); - float luma_zero = output_pix.x; - - vec2 pp = CHROMA_pos * CHROMA_size - vec2(0.5); - vec2 fp = floor(pp); - pp -= fp; - - vec2 chroma_pixels[12]; - chroma_pixels[0] = CHROMA_tex(vec2((fp + vec2(0.5, -0.5)) * CHROMA_pt)).xy; - chroma_pixels[1] = CHROMA_tex(vec2((fp + vec2(1.5, -0.5)) * CHROMA_pt)).xy; - chroma_pixels[2] = CHROMA_tex(vec2((fp + vec2(-0.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[3] = CHROMA_tex(vec2((fp + vec2( 0.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[4] = CHROMA_tex(vec2((fp + vec2( 1.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[5] = CHROMA_tex(vec2((fp + vec2( 2.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[6] = CHROMA_tex(vec2((fp + vec2(-0.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[7] = CHROMA_tex(vec2((fp + vec2( 0.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[8] = CHROMA_tex(vec2((fp + vec2( 1.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[9] = CHROMA_tex(vec2((fp + vec2( 2.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[10] = CHROMA_tex(vec2((fp + vec2(0.5, 2.5) ) * CHROMA_pt)).xy; - chroma_pixels[11] = CHROMA_tex(vec2((fp + vec2(1.5, 2.5) ) * CHROMA_pt)).xy; - - float luma_pixels[12]; - luma_pixels[0] = LUMA_LOWRES_tex(vec2((fp + vec2(0.5, -0.5)) * CHROMA_pt)).x; - luma_pixels[1] = LUMA_LOWRES_tex(vec2((fp + vec2(1.5, -0.5)) * CHROMA_pt)).x; - luma_pixels[2] = LUMA_LOWRES_tex(vec2((fp + vec2(-0.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[3] = LUMA_LOWRES_tex(vec2((fp + vec2( 0.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[4] = LUMA_LOWRES_tex(vec2((fp + vec2( 1.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[5] = LUMA_LOWRES_tex(vec2((fp + vec2( 2.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[6] = LUMA_LOWRES_tex(vec2((fp + vec2(-0.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[7] = LUMA_LOWRES_tex(vec2((fp + vec2( 0.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[8] = LUMA_LOWRES_tex(vec2((fp + vec2( 1.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[9] = LUMA_LOWRES_tex(vec2((fp + vec2( 2.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[10] = LUMA_LOWRES_tex(vec2((fp + vec2(0.5, 2.5) ) * CHROMA_pt)).x; - luma_pixels[11] = LUMA_LOWRES_tex(vec2((fp + vec2(1.5, 2.5) ) * CHROMA_pt)).x; - - float luma_avg_4 = 0.0; - luma_avg_4 += luma_pixels[3]; - luma_avg_4 += luma_pixels[4]; - luma_avg_4 += luma_pixels[7]; - luma_avg_4 += luma_pixels[8]; - luma_avg_4 /= 4.0; - - float luma_var_4 = 0.0; - luma_var_4 += pow(luma_pixels[3] - luma_avg_4, 2.0); - luma_var_4 += pow(luma_pixels[4] - luma_avg_4, 2.0); - luma_var_4 += pow(luma_pixels[7] - luma_avg_4, 2.0); - luma_var_4 += pow(luma_pixels[8] - luma_avg_4, 2.0); - - vec2 chroma_avg_4 = vec2(0.0); - chroma_avg_4 += chroma_pixels[3]; - chroma_avg_4 += chroma_pixels[4]; - chroma_avg_4 += chroma_pixels[7]; - chroma_avg_4 += chroma_pixels[8]; - chroma_avg_4 /= 4.0; - - vec2 luma_chroma_cov_4 = vec2(0.0); - luma_chroma_cov_4 += (luma_pixels[3] - luma_avg_4) * (chroma_pixels[3] - chroma_avg_4); - luma_chroma_cov_4 += (luma_pixels[4] - luma_avg_4) * (chroma_pixels[4] - chroma_avg_4); - luma_chroma_cov_4 += (luma_pixels[7] - luma_avg_4) * (chroma_pixels[7] - chroma_avg_4); - luma_chroma_cov_4 += (luma_pixels[8] - luma_avg_4) * (chroma_pixels[8] - chroma_avg_4); - - vec2 alpha_4 = luma_chroma_cov_4 / max(luma_var_4, division_limit); - vec2 beta_4 = chroma_avg_4 - alpha_4 * luma_avg_4; - - vec2 chroma_pred_4 = alpha_4 * luma_zero + beta_4; - chroma_pred_4 = clamp(chroma_pred_4, 0.0, 1.0); - - float luma_avg_12 = 0.0; - for(int i = 0; i < 12; i++) { - luma_avg_12 += luma_pixels[i]; - } - luma_avg_12 /= 12.0; - - float luma_var_12 = 0.0; - for(int i = 0; i < 12; i++) { - luma_var_12 += pow(luma_pixels[i] - luma_avg_12, 2.0); - } - - vec2 chroma_avg_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_avg_12 += chroma_pixels[i]; - } - chroma_avg_12 /= 12.0; - - vec2 chroma_var_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_var_12 += pow(chroma_pixels[i] - chroma_avg_12, vec2(2.0)); - } - - vec2 luma_chroma_cov_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - luma_chroma_cov_12 += (luma_pixels[i] - luma_avg_12) * (chroma_pixels[i] - chroma_avg_12); - } - - vec2 corr = abs(luma_chroma_cov_12 / max(sqrt(luma_var_12 * chroma_var_12), division_limit)); - corr = clamp(corr, 0.0, 1.0); - - vec2 alpha_12 = luma_chroma_cov_12 / max(luma_var_12, division_limit); - vec2 beta_12 = chroma_avg_12 - alpha_12 * luma_avg_12; - - vec2 chroma_pred_12 = alpha_12 * luma_zero + beta_12; - chroma_pred_12 = clamp(chroma_pred_12, 0.0, 1.0); - - chroma_pred_4 = mix(output_pix.yz, chroma_pred_4, pow(corr, vec2(2.0)) / 2.0); - chroma_pred_12 = mix(output_pix.yz, chroma_pred_12, pow(corr, vec2(2.0)) / 2.0); - output_pix.yz = mix(chroma_pred_4, chroma_pred_12, 0.5); - - output_pix.yz = clamp(output_pix.yz, 0.0, 1.0); - return output_pix; -} \ No newline at end of file diff --git a/.config/mpv/shaders/JointBilateral.glsl b/.config/mpv/shaders/JointBilateral.glsl index f9098e6..35e860d 100755 --- a/.config/mpv/shaders/JointBilateral.glsl +++ b/.config/mpv/shaders/JointBilateral.glsl @@ -71,7 +71,7 @@ vec4 hook() { //!PARAM distance_coeff //!TYPE float //!MINIMUM 0.0 -0.5 +2.5 //!PARAM intensity_coeff //!TYPE float @@ -88,26 +88,11 @@ vec4 hook() { //!OFFSET ALIGN //!DESC Joint Bilateral (Upscaling Chroma) -#define USE_SHARP_SPATIAL_FILTER 1 - -float comp_wd1(vec2 distance) { - float d2 = min(pow(length(distance), 2.0), 4.0); - return (25.0 / 16.0 * pow(2.0 / 5.0 * d2 - 1.0, 2.0) - (25.0 / 16.0 - 1.0)) * pow(1.0 / 4.0 * d2 - 1.0, 2.0); -} - -float comp_wd2(vec2 distance) { - return exp(-distance_coeff * pow(length(distance), 2.0)); -} - -float comp_wi(float distance) { - return exp(-intensity_coeff * pow(distance, 2.0)); +float comp_w(vec2 spatial_distance, float intensity_distance) { + return exp(-distance_coeff * pow(length(spatial_distance), 2.0) - intensity_coeff * pow(intensity_distance, 2.0)); } vec4 hook() { -#if (USE_SHARP_SPATIAL_FILTER == 1) - float ar_strength = 0.5; - float division_limit = 1e-4; -#endif float luma_zero = LUMA_texOff(0.0).x; vec4 output_pix = vec4(0.0, 0.0, 0.0, 1.0); @@ -143,117 +128,27 @@ vec4 hook() { luma_pixels[10] = LUMA_LOWRES_tex(vec2((fp + vec2( 0.5, 2.5)) * HOOKED_pt)).x; luma_pixels[11] = LUMA_LOWRES_tex(vec2((fp + vec2( 1.5, 2.5)) * HOOKED_pt)).x; - vec2 chroma_min = vec2(1e8); - chroma_min = min(chroma_min, chroma_pixels[3]); - chroma_min = min(chroma_min, chroma_pixels[4]); - chroma_min = min(chroma_min, chroma_pixels[7]); - chroma_min = min(chroma_min, chroma_pixels[8]); - - vec2 chroma_max = vec2(1e-8); - chroma_max = max(chroma_max, chroma_pixels[3]); - chroma_max = max(chroma_max, chroma_pixels[4]); - chroma_max = max(chroma_max, chroma_pixels[7]); - chroma_max = max(chroma_max, chroma_pixels[8]); - -#if (USE_SHARP_SPATIAL_FILTER == 1) - float wd1[12]; - wd1[0] = comp_wd1(vec2( 0.0,-1.0) - pp); - wd1[1] = comp_wd1(vec2( 1.0,-1.0) - pp); - wd1[2] = comp_wd1(vec2(-1.0, 0.0) - pp); - wd1[3] = comp_wd1(vec2( 0.0, 0.0) - pp); - wd1[4] = comp_wd1(vec2( 1.0, 0.0) - pp); - wd1[5] = comp_wd1(vec2( 2.0, 0.0) - pp); - wd1[6] = comp_wd1(vec2(-1.0, 1.0) - pp); - wd1[7] = comp_wd1(vec2( 0.0, 1.0) - pp); - wd1[8] = comp_wd1(vec2( 1.0, 1.0) - pp); - wd1[9] = comp_wd1(vec2( 2.0, 1.0) - pp); - wd1[10] = comp_wd1(vec2( 0.0, 2.0) - pp); - wd1[11] = comp_wd1(vec2( 1.0, 2.0) - pp); - - float wt1 = 0.0; - for (int i = 0; i < 12; i++) { - wt1 += wd1[i]; - } - - vec2 ct1 = vec2(0.0); - for (int i = 0; i < 12; i++) { - ct1 += wd1[i] * chroma_pixels[i]; - } - - vec2 chroma_spatial = clamp(ct1 / wt1, 0.0, 1.0); - chroma_spatial = mix(chroma_spatial, clamp(chroma_spatial, chroma_min, chroma_max), ar_strength); -#endif - float wd2[12]; - wd2[0] = comp_wd2(vec2( 0.0,-1.0) - pp); - wd2[1] = comp_wd2(vec2( 1.0,-1.0) - pp); - wd2[2] = comp_wd2(vec2(-1.0, 0.0) - pp); - wd2[3] = comp_wd2(vec2( 0.0, 0.0) - pp); - wd2[4] = comp_wd2(vec2( 1.0, 0.0) - pp); - wd2[5] = comp_wd2(vec2( 2.0, 0.0) - pp); - wd2[6] = comp_wd2(vec2(-1.0, 1.0) - pp); - wd2[7] = comp_wd2(vec2( 0.0, 1.0) - pp); - wd2[8] = comp_wd2(vec2( 1.0, 1.0) - pp); - wd2[9] = comp_wd2(vec2( 2.0, 1.0) - pp); - wd2[10] = comp_wd2(vec2( 0.0, 2.0) - pp); - wd2[11] = comp_wd2(vec2( 1.0, 2.0) - pp); - - float wi[12]; - for (int i = 0; i < 12; i++) { - wi[i] = comp_wi(luma_zero - luma_pixels[i]); - } - float w[12]; + w[0] = comp_w(vec2( 0.0,-1.0) - pp, luma_zero - luma_pixels[0] ); + w[1] = comp_w(vec2( 1.0,-1.0) - pp, luma_zero - luma_pixels[1] ); + w[2] = comp_w(vec2(-1.0, 0.0) - pp, luma_zero - luma_pixels[2] ); + w[3] = comp_w(vec2( 0.0, 0.0) - pp, luma_zero - luma_pixels[3] ); + w[4] = comp_w(vec2( 1.0, 0.0) - pp, luma_zero - luma_pixels[4] ); + w[5] = comp_w(vec2( 2.0, 0.0) - pp, luma_zero - luma_pixels[5] ); + w[6] = comp_w(vec2(-1.0, 1.0) - pp, luma_zero - luma_pixels[6] ); + w[7] = comp_w(vec2( 0.0, 1.0) - pp, luma_zero - luma_pixels[7] ); + w[8] = comp_w(vec2( 1.0, 1.0) - pp, luma_zero - luma_pixels[8] ); + w[9] = comp_w(vec2( 2.0, 1.0) - pp, luma_zero - luma_pixels[9] ); + w[10] = comp_w(vec2( 0.0, 2.0) - pp, luma_zero - luma_pixels[10]); + w[11] = comp_w(vec2( 1.0, 2.0) - pp, luma_zero - luma_pixels[11]); + + float wt = 0.0; + vec2 ct = vec2(0.0); for (int i = 0; i < 12; i++) { - w[i] = wd2[i] * wi[i]; + wt += w[i]; + ct += w[i] * chroma_pixels[i]; } - float wt2 = 0.0; - for (int i = 0; i < 12; i++) { - wt2 += w[i]; - } - - vec2 ct2 = vec2(0.0); - for (int i = 0; i < 12; i++) { - ct2 += w[i] * chroma_pixels[i]; - } - - vec2 chroma_bilat = clamp(ct2 / wt2, 0.0, 1.0); - -#if (USE_SHARP_SPATIAL_FILTER == 1) - float luma_avg = 0.0; - for(int i = 0; i < 12; i++) { - luma_avg += luma_pixels[i]; - } - luma_avg /= 12.0; - - float luma_var = 0.0; - for(int i = 0; i < 12; i++) { - luma_var += pow(luma_pixels[i] - luma_avg, 2.0); - } - - vec2 chroma_avg = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_avg += chroma_pixels[i]; - } - chroma_avg /= 12.0; - - vec2 chroma_var = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_var += pow(chroma_pixels[i] - chroma_avg, vec2(2.0)); - } - - vec2 luma_chroma_cov = vec2(0.0); - for(int i = 0; i < 12; i++) { - luma_chroma_cov += (luma_pixels[i] - luma_avg) * (chroma_pixels[i] - chroma_avg); - } - - vec2 corr = abs(luma_chroma_cov / max(sqrt(luma_var * chroma_var), division_limit)); - corr = clamp(corr, 0.0, 1.0); - - output_pix.xy = mix(chroma_spatial, chroma_bilat, pow(corr, vec2(2.0)) / 2.0); - output_pix.xy = clamp(output_pix.xy, 0.0, 1.0); -#else - output_pix.xy = chroma_bilat; -#endif + output_pix.xy = clamp(ct / wt, 0.0, 1.0); return output_pix; } diff --git a/.config/mpv/shaders/MemeBilateral.glsl b/.config/mpv/shaders/MemeBilateral.glsl deleted file mode 100755 index 18e11ea..0000000 --- a/.config/mpv/shaders/MemeBilateral.glsl +++ /dev/null @@ -1,202 +0,0 @@ -// MIT License - -// Copyright (c) 2023 João Chrisóstomo - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -//!PARAM distance_coeff -//!TYPE float -//!MINIMUM 0.0 -0.5 - -//!PARAM intensity_coeff -//!TYPE float -//!MINIMUM 0.0 -512.0 - -//!HOOK CHROMA -//!BIND CHROMA -//!BIND LUMA -//!WIDTH LUMA.w -//!HEIGHT LUMA.h -//!WHEN CHROMA.w LUMA.w < -//!OFFSET ALIGN -//!DESC Meme Bilateral (Upscaling Chroma) - -float comp_wd1(vec2 distance) { - float d = min(length(distance), 2.0); - if (d < 1.0) { - return (6.0 + d * d * (-15.0 + d * 9.0)) / 6.0; - } else { - return (12.0 + d * (-24.0 + d * (15.0 + d * -3.0))) / 6.0; - } -} - -float comp_wd2(vec2 distance) { - return exp(-distance_coeff * pow(length(distance), 2.0)); -} - -float comp_wi(float distance) { - return exp(-intensity_coeff * pow(distance, 2.0)); -} - -float comp_w(float wd, float wi) { - float w = wd * wi; - // return clamp(w, 1e-32, 1.0); - return w; -} - -vec4 hook() { - float division_limit = 1e-4; - float luma_zero = LUMA_texOff(0.0).x; - vec4 output_pix = vec4(0.0, 0.0, 0.0, 1.0); - - vec2 pp = CHROMA_pos * CHROMA_size - vec2(0.5); - vec2 fp = floor(pp); - pp -= fp; - - vec2 chroma_pixels[12]; - chroma_pixels[0] = CHROMA_tex(vec2((fp + vec2(0.5, -0.5)) * CHROMA_pt)).xy; - chroma_pixels[1] = CHROMA_tex(vec2((fp + vec2(1.5, -0.5)) * CHROMA_pt)).xy; - chroma_pixels[2] = CHROMA_tex(vec2((fp + vec2(-0.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[3] = CHROMA_tex(vec2((fp + vec2( 0.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[4] = CHROMA_tex(vec2((fp + vec2( 1.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[5] = CHROMA_tex(vec2((fp + vec2( 2.5, 0.5)) * CHROMA_pt)).xy; - chroma_pixels[6] = CHROMA_tex(vec2((fp + vec2(-0.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[7] = CHROMA_tex(vec2((fp + vec2( 0.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[8] = CHROMA_tex(vec2((fp + vec2( 1.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[9] = CHROMA_tex(vec2((fp + vec2( 2.5, 1.5)) * CHROMA_pt)).xy; - chroma_pixels[10] = CHROMA_tex(vec2((fp + vec2(0.5, 2.5) ) * CHROMA_pt)).xy; - chroma_pixels[11] = CHROMA_tex(vec2((fp + vec2(1.5, 2.5) ) * CHROMA_pt)).xy; - - float luma_pixels[12]; - luma_pixels[0] = LUMA_tex(vec2((fp + vec2(0.5, -0.5)) * CHROMA_pt)).x; - luma_pixels[1] = LUMA_tex(vec2((fp + vec2(1.5, -0.5)) * CHROMA_pt)).x; - luma_pixels[2] = LUMA_tex(vec2((fp + vec2(-0.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[3] = LUMA_tex(vec2((fp + vec2( 0.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[4] = LUMA_tex(vec2((fp + vec2( 1.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[5] = LUMA_tex(vec2((fp + vec2( 2.5, 0.5)) * CHROMA_pt)).x; - luma_pixels[6] = LUMA_tex(vec2((fp + vec2(-0.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[7] = LUMA_tex(vec2((fp + vec2( 0.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[8] = LUMA_tex(vec2((fp + vec2( 1.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[9] = LUMA_tex(vec2((fp + vec2( 2.5, 1.5)) * CHROMA_pt)).x; - luma_pixels[10] = LUMA_tex(vec2((fp + vec2(0.5, 2.5) ) * CHROMA_pt)).x; - luma_pixels[11] = LUMA_tex(vec2((fp + vec2(1.5, 2.5) ) * CHROMA_pt)).x; - - -// Sharp spatial filter - float wd1[12]; - wd1[0] = comp_wd1(vec2( 0.0,-1.0) - pp); - wd1[1] = comp_wd1(vec2( 1.0,-1.0) - pp); - wd1[2] = comp_wd1(vec2(-1.0, 0.0) - pp); - wd1[3] = comp_wd1(vec2( 0.0, 0.0) - pp); - wd1[4] = comp_wd1(vec2( 1.0, 0.0) - pp); - wd1[5] = comp_wd1(vec2( 2.0, 0.0) - pp); - wd1[6] = comp_wd1(vec2(-1.0, 1.0) - pp); - wd1[7] = comp_wd1(vec2( 0.0, 1.0) - pp); - wd1[8] = comp_wd1(vec2( 1.0, 1.0) - pp); - wd1[9] = comp_wd1(vec2( 2.0, 1.0) - pp); - wd1[10] = comp_wd1(vec2( 0.0, 2.0) - pp); - wd1[11] = comp_wd1(vec2( 1.0, 2.0) - pp); - - float wt1 = 0.0; - for (int i = 0; i < 12; i++) { - wt1 += wd1[i]; - } - - vec2 ct1 = vec2(0.0); - for (int i = 0; i < 12; i++) { - ct1 += wd1[i] * chroma_pixels[i]; - } - - vec2 chroma_spatial = ct1 / wt1; - -// Bilateral filter - float wd2[12]; - wd2[0] = comp_wd2(vec2( 0.0,-1.0) - pp); - wd2[1] = comp_wd2(vec2( 1.0,-1.0) - pp); - wd2[2] = comp_wd2(vec2(-1.0, 0.0) - pp); - wd2[3] = comp_wd2(vec2( 0.0, 0.0) - pp); - wd2[4] = comp_wd2(vec2( 1.0, 0.0) - pp); - wd2[5] = comp_wd2(vec2( 2.0, 0.0) - pp); - wd2[6] = comp_wd2(vec2(-1.0, 1.0) - pp); - wd2[7] = comp_wd2(vec2( 0.0, 1.0) - pp); - wd2[8] = comp_wd2(vec2( 1.0, 1.0) - pp); - wd2[9] = comp_wd2(vec2( 2.0, 1.0) - pp); - wd2[10] = comp_wd2(vec2( 0.0, 2.0) - pp); - wd2[11] = comp_wd2(vec2( 1.0, 2.0) - pp); - - float wi[12]; - for (int i = 0; i < 12; i++) { - wi[i] = comp_wi(luma_zero - luma_pixels[i]); - } - - float w[12]; - for (int i = 0; i < 12; i++) { - w[i] = comp_w(wd2[i], wi[i]); - } - - float wt2 = 0.0; - for (int i = 0; i < 12; i++) { - wt2 += w[i]; - } - - vec2 ct2 = vec2(0.0); - for (int i = 0; i < 12; i++) { - ct2 += w[i] * chroma_pixels[i]; - } - - vec2 chroma_bilat = ct2 / wt2; - - -// Coefficient of determination - float luma_avg_12 = 0.0; - for(int i = 0; i < 12; i++) { - luma_avg_12 += luma_pixels[i]; - } - luma_avg_12 /= 12.0; - - float luma_var_12 = 0.0; - for(int i = 0; i < 12; i++) { - luma_var_12 += pow(luma_pixels[i] - luma_avg_12, 2.0); - } - - vec2 chroma_avg_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_avg_12 += chroma_pixels[i]; - } - chroma_avg_12 /= 12.0; - - vec2 chroma_var_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - chroma_var_12 += pow(chroma_pixels[i] - chroma_avg_12, vec2(2.0)); - } - - vec2 luma_chroma_cov_12 = vec2(0.0); - for(int i = 0; i < 12; i++) { - luma_chroma_cov_12 += (luma_pixels[i] - luma_avg_12) * (chroma_pixels[i] - chroma_avg_12); - } - - vec2 corr = abs(luma_chroma_cov_12 / max(sqrt(luma_var_12 * chroma_var_12), division_limit)); - corr = clamp(corr, 0.0, 1.0); - - output_pix.xy = mix(chroma_spatial, chroma_bilat, pow(corr, vec2(2.0)) / 2.0); - output_pix.xy = clamp(output_pix.xy, 0.0, 1.0); - return output_pix; -}