mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

glcolorconvert: Fix last commit

Browse source
This commit is contained in:
Sebastian Dröge 2015-04-11 19:35:48 +02:00 committed by Tim-Philipp Müller
parent 4a8001e683
commit 659477c7c7
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst-libs/gst/gl/gstglcolorconvert.c
View file

@ -897,10 +897,12 @@ _YUV_to_RGB (GstGLColorConvert * convert)
const gchar *out_format_str = gst_video_format_to_string (out_format); const gchar *out_format_str = gst_video_format_to_string (out_format);
gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str);
gboolean texture_rg = gboolean texture_rg =
gst_gl_context_check_feature (context, "GL_EXT_texture_rg") gst_gl_context_check_feature (convert->context, "GL_EXT_texture_rg")
|| gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0) || gst_gl_context_check_gl_version (convert->context, GST_GL_API_GLES2, 3,
|| gst_gl_context_check_feature (context, "GL_ARB_texture_rg") 0)
|| gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0); || gst_gl_context_check_feature (convert->context, "GL_ARB_texture_rg")
|| gst_gl_context_check_gl_version (convert->context, GST_GL_API_OPENGL3,
3, 0);
gboolean apple_ycbcr = gst_gl_context_check_feature (convert->context, gboolean apple_ycbcr = gst_gl_context_check_feature (convert->context,
"GL_APPLE_ycbcr_422"); "GL_APPLE_ycbcr_422");
gboolean in_tex_rectangular = FALSE; gboolean in_tex_rectangular = FALSE;
@ -1133,10 +1135,12 @@ _GRAY_to_RGB (GstGLColorConvert * convert)
const gchar *out_format_str = gst_video_format_to_string (out_format); const gchar *out_format_str = gst_video_format_to_string (out_format);
gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str); gchar *pixel_order = _RGB_pixel_order ("rgba", out_format_str);
gboolean texture_rg = gboolean texture_rg =
gst_gl_context_check_feature (context, "GL_EXT_texture_rg") gst_gl_context_check_feature (convert->context, "GL_EXT_texture_rg")
|| gst_gl_context_check_gl_version (context, GST_GL_API_GLES2, 3, 0) || gst_gl_context_check_gl_version (convert->context, GST_GL_API_GLES2, 3,
|| gst_gl_context_check_feature (context, "GL_ARB_texture_rg") 0)
|| gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL3, 3, 0); || gst_gl_context_check_feature (convert->context, "GL_ARB_texture_rg")
|| gst_gl_context_check_gl_version (convert->context, GST_GL_API_OPENGL3,
3, 0);
info->in_n_textures = 1; info->in_n_textures = 1;
info->out_n_textures = 1; info->out_n_textures = 1;