mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-30 02:05:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

[672/906] display: constify GstGLFuncs *gl

Browse source
This commit is contained in:
Matthew Waters 2013-03-09 22:05:28 +11:00 committed by Tim-Philipp Müller
parent 267bf848de
commit 792f055db4
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst-libs/gst/gl/gstgldisplay.c
View file

@ -321,7 +321,7 @@ gst_gl_display_set_error (GstGLDisplay * display, const char *format, ...)
static gboolean static gboolean
_create_context_gles2 (GstGLDisplay * display, gint * gl_major, gint * gl_minor) _create_context_gles2 (GstGLDisplay * display, gint * gl_major, gint * gl_minor)
{ {
GstGLFuncs *gl; const GstGLFuncs *gl;
GLenum gl_err = GL_NO_ERROR; GLenum gl_err = GL_NO_ERROR;
gl = display->gl_vtable; gl = display->gl_vtable;
@ -359,7 +359,7 @@ gboolean
_create_context_opengl (GstGLDisplay * display, gint * gl_major, _create_context_opengl (GstGLDisplay * display, gint * gl_major,
gint * gl_minor) gint * gl_minor)
{ {
GstGLFuncs *gl; const GstGLFuncs *gl;
guint maj, min; guint maj, min;
GLenum gl_err = GL_NO_ERROR; GLenum gl_err = GL_NO_ERROR;
GString *opengl_version = NULL; GString *opengl_version = NULL;
@ -592,7 +592,7 @@ void
_gen_fbo (GstGLDisplay * display) _gen_fbo (GstGLDisplay * display)
{ {
/* a texture must be attached to the FBO */ /* a texture must be attached to the FBO */
GstGLFuncs *gl = display->gl_vtable; const GstGLFuncs *gl = display->gl_vtable;
GLuint fake_texture = 0; GLuint fake_texture = 0;
GST_TRACE ("creating FBO dimensions:%ux%u", display->priv->gen_fbo_width, GST_TRACE ("creating FBO dimensions:%ux%u", display->priv->gen_fbo_width,
@ -664,7 +664,7 @@ _gen_fbo (GstGLDisplay * display)
void void
_use_fbo (GstGLDisplay * display) _use_fbo (GstGLDisplay * display)
{ {
GstGLFuncs *gl = display->gl_vtable; const GstGLFuncs *gl = display->gl_vtable;
#if GST_GL_HAVE_GLES2 #if GST_GL_HAVE_GLES2
GLint viewport_dim[4]; GLint viewport_dim[4];
#endif #endif
@ -764,7 +764,7 @@ _use_fbo (GstGLDisplay * display)
void void
_use_fbo_v2 (GstGLDisplay * display) _use_fbo_v2 (GstGLDisplay * display)
{ {
GstGLFuncs *gl = display->gl_vtable; const GstGLFuncs *gl = display->gl_vtable;
GLint viewport_dim[4]; GLint viewport_dim[4];
GST_TRACE ("Binding v2 FBO %u dimensions:%ux%u with texture:%u ", GST_TRACE ("Binding v2 FBO %u dimensions:%ux%u with texture:%u ",
@ -805,7 +805,7 @@ _use_fbo_v2 (GstGLDisplay * display)
void void
_del_fbo (GstGLDisplay * display) _del_fbo (GstGLDisplay * display)
{ {
GstGLFuncs *gl = display->gl_vtable; const GstGLFuncs *gl = display->gl_vtable;
GST_TRACE ("Deleting FBO %u", display->priv->del_fbo); GST_TRACE ("Deleting FBO %u", display->priv->del_fbo);
@ -823,7 +823,7 @@ _del_fbo (GstGLDisplay * display)
void void
_gen_shader (GstGLDisplay * display) _gen_shader (GstGLDisplay * display)
{ {
GstGLFuncs *gl = display->gl_vtable; const GstGLFuncs *gl = display->gl_vtable;
GST_TRACE ("Generating shader %" GST_PTR_FORMAT, display->priv->gen_shader); GST_TRACE ("Generating shader %" GST_PTR_FORMAT, display->priv->gen_shader);
@ -884,7 +884,7 @@ _del_shader (GstGLDisplay * display)
void void
gst_gl_display_on_resize (GstGLDisplay * display, gint width, gint height) gst_gl_display_on_resize (GstGLDisplay * display, gint width, gint height)
{ {
GstGLFuncs *gl = display->gl_vtable; const GstGLFuncs *gl = display->gl_vtable;
GST_TRACE ("GL Window resized to %ux%u", width, height); GST_TRACE ("GL Window resized to %ux%u", width, height);
@ -928,7 +928,7 @@ gst_gl_display_on_resize (GstGLDisplay * display, gint width, gint height)
void void
gst_gl_display_on_draw (GstGLDisplay * display) gst_gl_display_on_draw (GstGLDisplay * display)
{ {
GstGLFuncs *gl = display->gl_vtable; const GstGLFuncs *gl = display->gl_vtable;
/* check if texture is ready for being drawn */ /* check if texture is ready for being drawn */
if (!display->priv->redisplay_texture) if (!display->priv->redisplay_texture)
@ -1056,7 +1056,7 @@ void
gst_gl_display_gen_texture_thread (GstGLDisplay * display, GLuint * pTexture, gst_gl_display_gen_texture_thread (GstGLDisplay * display, GLuint * pTexture,
GstVideoFormat v_format, GLint width, GLint height) GstVideoFormat v_format, GLint width, GLint height)
{ {
GstGLFuncs *gl = display->gl_vtable; const GstGLFuncs *gl = display->gl_vtable;
GST_TRACE ("Generating texture format:%u dimensions:%ux%u", v_format, GST_TRACE ("Generating texture format:%u dimensions:%ux%u", v_format,
width, height); width, height);
@ -1075,11 +1075,14 @@ gst_gl_display_gen_texture_thread (GstGLDisplay * display, GLuint * pTexture,
case GST_VIDEO_FORMAT_BGRA: case GST_VIDEO_FORMAT_BGRA:
case GST_VIDEO_FORMAT_ARGB: case GST_VIDEO_FORMAT_ARGB:
case GST_VIDEO_FORMAT_ABGR: case GST_VIDEO_FORMAT_ABGR:
{
gl->TexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, gl->TexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8,
width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
break; break;
}
case GST_VIDEO_FORMAT_YUY2: case GST_VIDEO_FORMAT_YUY2:
case GST_VIDEO_FORMAT_UYVY: case GST_VIDEO_FORMAT_UYVY:
{
switch (display->colorspace_conversion) { switch (display->colorspace_conversion) {
case GST_GL_DISPLAY_CONVERSION_GLSL: case GST_GL_DISPLAY_CONVERSION_GLSL:
case GST_GL_DISPLAY_CONVERSION_MATRIX: case GST_GL_DISPLAY_CONVERSION_MATRIX:
@ -1102,16 +1105,21 @@ gst_gl_display_gen_texture_thread (GstGLDisplay * display, GLuint * pTexture,
display->colorspace_conversion); display->colorspace_conversion);
} }
break; break;
}
case GST_VIDEO_FORMAT_I420: case GST_VIDEO_FORMAT_I420:
case GST_VIDEO_FORMAT_YV12: case GST_VIDEO_FORMAT_YV12:
case GST_VIDEO_FORMAT_AYUV: case GST_VIDEO_FORMAT_AYUV:
{
gl->TexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, gl->TexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8,
width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
break; break;
}
default: default:
{
gst_gl_display_set_error (display, "Unsupported upload video format %d", gst_gl_display_set_error (display, "Unsupported upload video format %d",
v_format); v_format);
break; break;
}
} }
gl->TexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, gl->TexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER,