glcolorconvert: Fix YUY2 and UYVY support with luminance_alpha

https://bugzilla.gnome.org/show_bug.cgi?id=730666
This commit is contained in:
Nicolas Dufresne 2014-05-23 23:02:32 -04:00 committed by Tim-Philipp Müller
parent 146c666ba2
commit 73c73470a0

View file

@ -297,16 +297,16 @@ static const gchar frag_YUY2_UYVY_to_RGB[] =
" vec3 yuv;\n" " vec3 yuv;\n"
" vec4 uv_texel;\n" " vec4 uv_texel;\n"
" float r, g, b, a;\n" " float r, g, b, a;\n"
" float dx = 1.0 / width;\n" " float dx1 = -1.0 / width;\n"
" float dx2 = 0.0;\n"
" yuv.x = texture2D(Ytex, v_texcoord * tex_scale0).%c;\n" " yuv.x = texture2D(Ytex, v_texcoord * tex_scale0).%c;\n"
" float inorder = mod (v_texcoord.x * width, 2.0);" " float inorder = mod (v_texcoord.x * width, 2.0);\n"
" if (inorder < 1.0) {" " if (inorder < 1.0) {\n"
" uv_texel.rg = texture2D(Ytex, v_texcoord * tex_scale0).rg;" " dx2 = -dx1;\n"
" uv_texel.ba = texture2D(Ytex, v_texcoord * tex_scale0 + dx).rg;" " dx1 = 0.0;\n"
" } else {" " }\n"
" uv_texel.rg = texture2D(Ytex, v_texcoord * tex_scale0 - dx).rg;" " uv_texel.rg = texture2D(Ytex, v_texcoord * tex_scale0 + dx1).r%c;\n"
" uv_texel.ba = texture2D(Ytex, v_texcoord * tex_scale0).rg;" " uv_texel.ba = texture2D(Ytex, v_texcoord * tex_scale0 + dx2).r%c;\n"
" }"
" yuv.yz = uv_texel.%c%c;\n" " yuv.yz = uv_texel.%c%c;\n"
" yuv += offset;\n" " yuv += offset;\n"
" r = dot(yuv, coeff1);\n" " r = dot(yuv, coeff1);\n"
@ -732,11 +732,15 @@ _YUV_to_RGB (GstGLColorConvert * convert)
info->shader_tex_names[2] = "Utex"; info->shader_tex_names[2] = "Utex";
break; break;
case GST_VIDEO_FORMAT_YUY2: case GST_VIDEO_FORMAT_YUY2:
info->frag_prog = g_strdup_printf (frag_YUY2_UYVY_to_RGB, 'r', 'g', 'a', {
pixel_order[0], pixel_order[1], pixel_order[2], pixel_order[3]); char uv_val = texture_rg ? 'g' : 'a';
info->frag_prog = g_strdup_printf (frag_YUY2_UYVY_to_RGB, 'r', uv_val,
uv_val, 'g', 'a', pixel_order[0], pixel_order[1], pixel_order[2],
pixel_order[3]);
info->in_n_textures = 1; info->in_n_textures = 1;
info->shader_tex_names[0] = "Ytex"; info->shader_tex_names[0] = "Ytex";
break; break;
}
case GST_VIDEO_FORMAT_NV12: case GST_VIDEO_FORMAT_NV12:
{ {
char val2 = texture_rg ? 'g' : 'a'; char val2 = texture_rg ? 'g' : 'a';
@ -760,8 +764,9 @@ _YUV_to_RGB (GstGLColorConvert * convert)
case GST_VIDEO_FORMAT_UYVY: case GST_VIDEO_FORMAT_UYVY:
{ {
char y_val = texture_rg ? 'g' : 'a'; char y_val = texture_rg ? 'g' : 'a';
info->frag_prog = g_strdup_printf (frag_YUY2_UYVY_to_RGB, y_val, 'r', 'b', info->frag_prog = g_strdup_printf (frag_YUY2_UYVY_to_RGB, y_val, 'g',
pixel_order[0], pixel_order[1], pixel_order[2], pixel_order[3]); 'g', 'r', 'b', pixel_order[0], pixel_order[1], pixel_order[2],
pixel_order[3]);
info->in_n_textures = 1; info->in_n_textures = 1;
info->shader_tex_names[0] = "Ytex"; info->shader_tex_names[0] = "Ytex";
break; break;