RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: improve superxbr algorithm 

The values were changed to reflect an upstream change in the source for
the super-xBR implementation.

The anti-ringing code was basically not working at all, the new
algorithm _significantly_ improves the result (reduces ringing).
This commit is contained in:
Niklas Haas 2016-03-07 20:26:36 +01:00 committed by wm4
parent 9f91bc4b75
commit c68721b832
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
video/out/opengl/superxbr.c
View File

@ -82,24 +82,24 @@ struct step_params {
const struct step_params params[3] = { const struct step_params params[3] = {
{ .dstr = 0.129633, { .dstr = 0.129633,
.ostr = 0.175068, .ostr = 0.175068,
.d1 = {{1, 2, 1}, .d1 = {{0, 1, 0},
{2, 4, 2}, {1, 2, 1},
{1, 2, 1}}, {0, 1, 0}},
.d2 = {{-1, -1}, .d2 = {{-1, 0},
{-1, -1}}, { 0, -1}},
.o1 = {1, 2, 1}, .o1 = {1, 2, 1},
.o2 = {-1, -1}, .o2 = { 0, 0},
}, { }, {
.dstr = 0.175068, .dstr = 0.175068,
.ostr = 0.129633, .ostr = 0.129633,
.d1 = {{0, 2, 0}, .d1 = {{0, 1, 0},
{2, 0, 2}, {1, 4, 1},
{0, 2, 0}}, {0, 1, 0}},
.d2 = {{ 0, 0}, .d2 = {{ 0, 0},
{ 0, 0}}, { 0, 0}},
.o1 = {2, 0, 2}, .o1 = {1, 4, 1},
.o2 = { 0, 0}, .o2 = { 0, 0},
} }
}; };
@ -182,8 +182,7 @@ static void superxbr_step_h(struct gl_shader_cache *sc,
// Anti-ringing using center square // Anti-ringing using center square
GLSLH(float lo = min(min( i(1,1), i(2,1) ), min( i(1,2), i(2,2) ));) GLSLH(float lo = min(min( i(1,1), i(2,1) ), min( i(1,2), i(2,2) ));)
GLSLH(float hi = max(max( i(1,1), i(2,1) ), max( i(1,2), i(2,2) ));) GLSLH(float hi = max(max( i(1,1), i(2,1) ), max( i(1,2), i(2,2) ));)
GLSLHF("res = mix(res, clamp(res, lo, hi), 1.0-2.0*abs(%f-0.5));\n", GLSLH(res = clamp(res, lo, hi);)
conf->edge_strength);
GLSLHF("} // step\n"); GLSLHF("} // step\n");
} }