diff options
| author | wm4 <wm4@nowhere> | 2015-01-21 19:29:18 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-01-21 19:29:18 +0100 |
| commit | a0caadd512a6f531fd01638570883e629f9dc6e5 (patch) | |
| tree | 9023c03a9229b1ef2e7c5fee0aea778fbf0c2edc /video/out/gl_video_shaders.glsl | |
| parent | 30ca30c0a16a7ee034d9e05280ba221427d48ba1 (diff) | |
| download | mpv-a0caadd512a6f531fd01638570883e629f9dc6e5.tar.bz2 mpv-a0caadd512a6f531fd01638570883e629f9dc6e5.tar.xz | |
vo_opengl: handle grayscale input better, add YA16 support
Simply clamp off the U/V components in the colormatrix, instead of doing
something special in the shader.
Also, since YA8/YA16 gave a plane_bits value of 16/32, and a colormatrix
calculation overflowed with 32, add a component_bits field to the image
format descriptor, which for YA8/YA16 returns 8/16 (the wrong value had
no bad consequences otherwise).
Diffstat (limited to 'video/out/gl_video_shaders.glsl')
| -rw-r--r-- | video/out/gl_video_shaders.glsl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/video/out/gl_video_shaders.glsl b/video/out/gl_video_shaders.glsl index 2f2986c9fa..51c444aa2e 100644 --- a/video/out/gl_video_shaders.glsl +++ b/video/out/gl_video_shaders.glsl @@ -381,11 +381,6 @@ void main() { #endif vec3 color = acolor.rgb; float alpha = acolor.a; -#ifdef USE_YGRAY - // NOTE: actually slightly wrong for 16 bit input video, and completely - // wrong for 9/10 bit input - color.gb = vec2(128.0/255.0); -#endif #ifdef USE_INPUT_GAMMA // Pre-colormatrix input gamma correction (eg. for MP_IMGFLAG_XYZ) color = pow(color, vec3(input_gamma)); |