github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-11 00:15:33 +01:00
Code Releases Activity

vo_opengl: apply alpha after conversion to rgb

Browse Source 
Currently this was done before conversion, which could fuck up a
hypothetical YUVA stream.
This commit is contained in:
Niklas Haas 2015-03-13 21:29:04 +01:00
parent add208c58a
commit 59c18dc73d
No known key found for this signature in database
GPG Key ID: 3BA77D4BFDB10BCE
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
video/out/gl_video.c
View File

@ -1211,7 +1211,7 @@ static void pass_read_video(struct gl_video *p)
if (p->plane_count == 1) {
GLSL(vec4 color = texture(texture0, texcoord0);)
goto fixalpha;
return;
}
const char *cscale = p->opts.scalers[1];
@ -1253,16 +1253,8 @@ static void pass_read_video(struct gl_video *p)
}
GLSL(color = vec4(texture(texture0, texcoord0).r, chroma, 1.0);)
fixalpha:
if (p->has_alpha) {
if (p->plane_count >= 4)
GLSL(color.a = texture(texture3, texcoord3).r;)
if (p->opts.alpha_mode == 0) // none
GLSL(color.a = 1.0;)
if (p->opts.alpha_mode == 2) // blend
GLSL(color = vec4(color.rgb * color.a, 1.0);)
}
if (p->has_alpha && p->plane_count >= 4)
GLSL(color.a = texture(texture3, texcoord3).r;)
}
// yuv conversion, and any other conversions before main up/down-scaling
@ -1352,8 +1344,11 @@ static void pass_convert_yuv(struct gl_video *p)
GLSL(color.rgb = pow(color.rgb, vec3(1.0 / user_gamma));)
}
if (!p->has_alpha)
if (!p->has_alpha || p->opts.alpha_mode == 0) { // none
GLSL(color.a = 1.0;)
} else if (p->opts.alpha_mode == 2) { // blend
GLSL(color = vec4(color.rgb * color.a, 1.0);)
}
}
static void get_scale_factors(struct gl_video *p, double xy[2])