mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

[233/906] no need to explicit set the debug category if default one is used

Browse source
This commit is contained in:
Filippo Argiolas 2008-09-21 10:58:13 +02:00 committed by Tim-Philipp Müller
parent 6c04333f11
commit f18ba293cb
1 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -478,7 +478,7 @@ gst_gl_display_finalize (GObject* object)
if (g_hash_table_size (gst_gl_display_map) == 0)
{
g_thread_join (gst_gl_display_gl_thread);
GST_CAT_INFO (GST_CAT_DEFAULT, "gl thread joined");
GST_INFO ("gl thread joined");
gst_gl_display_gl_thread = NULL;
g_async_queue_unref (gst_gl_display_messageQueue);
g_hash_table_unref (gst_gl_display_map);
@ -513,9 +513,9 @@ gst_gl_display_thread_func (GstGLDisplay *display)
gst_gl_display_thread_create_context (display);
gst_gl_display_unlock (display);
GST_CAT_INFO (GST_CAT_DEFAULT, "gl mainLoop started");
GST_INFO ("gl mainLoop started");
glutMainLoop ();
GST_CAT_INFO (GST_CAT_DEFAULT, "gl mainLoop exited");
GST_INFO ("gl mainLoop exited");
return NULL;
}
@ -543,7 +543,7 @@ gst_gl_display_thread_loop (void)
gst_gl_display_thread_dispatch_action (msg);
}
}
else GST_CAT_INFO (GST_CAT_DEFAULT, "timeout reached in idle func");
else GST_INFO ("timeout reached in idle func");
}
@ -690,7 +690,7 @@ gst_gl_display_thread_create_context (GstGLDisplay *display)
display->title = g_string_append (display->title, buffer);
glutWinId = glutCreateWindow (display->title->str, display->winId);
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d created", glutWinId);
GST_INFO ("Context %d created", glutWinId);
if (display->visible)
glutShowWindow ();
@ -701,7 +701,7 @@ gst_gl_display_thread_create_context (GstGLDisplay *display)
err = glewInit();
if (err != GLEW_OK)
{
GST_CAT_ERROR_OBJECT (GST_CAT_DEFAULT, display, "Failed to init GLEW: %s",
GST_ERROR_OBJECT (display, "Failed to init GLEW: %s",
glewGetErrorString (err));
display->isAlive = FALSE;
}
@ -714,13 +714,13 @@ gst_gl_display_thread_create_context (GstGLDisplay *display)
sscanf(opengl_version->str, "%d.%d", &opengl_version_major, &opengl_version_minor);
GST_CAT_INFO (GST_CAT_DEFAULT, "GL_VERSION: %s", glGetString (GL_VERSION));
GST_CAT_INFO (GST_CAT_DEFAULT, "GLEW_VERSION: %s", glewGetString (GLEW_VERSION));
GST_INFO ("GL_VERSION: %s", glGetString (GL_VERSION));
GST_INFO ("GLEW_VERSION: %s", glewGetString (GLEW_VERSION));
if (glGetString (GL_SHADING_LANGUAGE_VERSION))
GST_CAT_INFO (GST_CAT_DEFAULT, "GL_SHADING_LANGUAGE_VERSION: %s", glGetString (GL_SHADING_LANGUAGE_VERSION));
GST_INFO ("GL_SHADING_LANGUAGE_VERSION: %s", glGetString (GL_SHADING_LANGUAGE_VERSION));
GST_CAT_INFO (GST_CAT_DEFAULT, "GL_VENDOR: %s", glGetString (GL_VENDOR));
GST_CAT_INFO (GST_CAT_DEFAULT, "GL_RENDERER: %s", glGetString (GL_RENDERER));
GST_INFO ("GL_VENDOR: %s", glGetString (GL_VENDOR));
GST_INFO ("GL_RENDERER: %s", glGetString (GL_RENDERER));
g_string_free (opengl_version, TRUE);
@ -730,7 +730,7 @@ gst_gl_display_thread_create_context (GstGLDisplay *display)
(GLEW_VERSION_MAJOR < 2 && GLEW_VERSION_MAJOR >= 1 && GLEW_VERSION_MINOR < 4) )
{
//turn off the pipeline, the old drivers are not yet supported
GST_CAT_WARNING (GST_CAT_DEFAULT, "Required OpenGL >= 1.2.0 and Glew >= 1.4.0");
GST_WARNING ("Required OpenGL >= 1.2.0 and Glew >= 1.4.0");
display->isAlive = FALSE;
}
}
@ -746,7 +746,7 @@ gst_gl_display_thread_create_context (GstGLDisplay *display)
//check glut id validity
g_assert (glutGetWindow() == glutWinId);
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d initialized", display->glutWinId);
GST_INFO ("Context %d initialized", display->glutWinId);
//release display constructor
g_cond_signal (display->cond_create_context);
@ -872,7 +872,7 @@ gst_gl_display_thread_destroy_context (GstGLDisplay *display)
NULL);
g_hash_table_remove (gst_gl_display_map, GINT_TO_POINTER (display->glutWinId));
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d destroyed", display->glutWinId);
GST_INFO ("Context %d destroyed", display->glutWinId);
//if the map is empty, leaveMainloop and join the thread
if (g_hash_table_size (gst_gl_display_map) == 0)
@ -989,7 +989,7 @@ gst_gl_display_thread_init_upload (GstGLDisplay *display)
/* shouldn't we require ARB_shading_language_100? --Filippo */
if (GLEW_ARB_fragment_shader)
{
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d, ARB_fragment_shader supported: yes", display->glutWinId);
GST_INFO ("Context %d, ARB_fragment_shader supported: yes", display->glutWinId);
display->upload_colorspace_conversion = GST_GL_DISPLAY_CONVERSION_GLSL;
@ -1066,8 +1066,8 @@ gst_gl_display_thread_init_upload (GstGLDisplay *display)
else if (GLEW_MESA_ycbcr_texture)
{
//GLSL and Color Matrix are not available on your drivers, switch to YCBCR MESA
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d, ARB_fragment_shader supported: no", display->glutWinId);
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d, GLEW_MESA_ycbcr_texture supported: yes", display->glutWinId);
GST_INFO ("Context %d, ARB_fragment_shader supported: no", display->glutWinId);
GST_INFO ("Context %d, GLEW_MESA_ycbcr_texture supported: yes", display->glutWinId);
display->upload_colorspace_conversion = GST_GL_DISPLAY_CONVERSION_MESA;
@ -1097,21 +1097,21 @@ gst_gl_display_thread_init_upload (GstGLDisplay *display)
else if (GLEW_ARB_imaging)
{
//GLSL is not available on your drivers, switch to Color Matrix
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d, ARB_fragment_shader supported: no", display->glutWinId);
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d, GLEW_MESA_ycbcr_texture supported: no", display->glutWinId);
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d, GLEW_ARB_imaging supported: yes", display->glutWinId);
GST_INFO ("Context %d, ARB_fragment_shader supported: no", display->glutWinId);
GST_INFO ("Context %d, GLEW_MESA_ycbcr_texture supported: no", display->glutWinId);
GST_INFO ("Context %d, GLEW_ARB_imaging supported: yes", display->glutWinId);
display->upload_colorspace_conversion = GST_GL_DISPLAY_CONVERSION_MATRIX;
//turn off the pipeline because we do not support it yet
GST_CAT_WARNING (GST_CAT_DEFAULT, "Colorspace conversion using Color Matrix is not yet supported");
GST_WARNING ("Colorspace conversion using Color Matrix is not yet supported");
display->isAlive = FALSE;
}
else
{
GST_CAT_WARNING (GST_CAT_DEFAULT, "Context %d, ARB_fragment_shader supported: no", display->glutWinId);
GST_CAT_WARNING (GST_CAT_DEFAULT, "Context %d, GLEW_ARB_imaging supported: no", display->glutWinId);
GST_CAT_WARNING (GST_CAT_DEFAULT, "Context %d, GLEW_MESA_ycbcr_texture supported: no", display->glutWinId);
GST_WARNING ("Context %d, ARB_fragment_shader supported: no", display->glutWinId);
GST_WARNING ("Context %d, GLEW_ARB_imaging supported: no", display->glutWinId);
GST_WARNING ("Context %d, GLEW_MESA_ycbcr_texture supported: no", display->glutWinId);
//turn off the pipeline because colorspace conversion is not possible
display->isAlive = FALSE;
@ -1310,7 +1310,7 @@ gst_gl_display_thread_init_download (GstGLDisplay *display)
{
//turn off the pipeline because Frame buffer object is a requirement when using filters
//or when using GLSL colorspace conversion
GST_CAT_WARNING (GST_CAT_DEFAULT, "Context %d, EXT_framebuffer_object supported: no", display->glutWinId);
GST_WARNING ("Context %d, EXT_framebuffer_object supported: no", display->glutWinId);
display->isAlive = FALSE;
}
}
@ -1612,7 +1612,7 @@ gst_gl_display_thread_gen_shader (GstGLDisplay* display)
gst_gl_shader_compile (display->gen_shader, &error);
if (error)
{
GST_CAT_ERROR (GST_CAT_DEFAULT, "%s", error->message);
GST_ERROR ("%s", error->message);
g_error_free (error);
error = NULL;
gst_gl_shader_use (NULL);
@ -1629,7 +1629,7 @@ gst_gl_display_thread_gen_shader (GstGLDisplay* display)
}
else
{
GST_CAT_WARNING (GST_CAT_DEFAULT, "One of the filter required ARB_fragment_shader");
GST_WARNING ("One of the filter required ARB_fragment_shader");
display->isAlive = FALSE;
display->gen_shader = NULL;
}
@ -1815,7 +1815,7 @@ void gst_gl_display_on_close (void)
//glutGetWindow return 0 if no windows exists, then g_hash_table_lookup return NULL
if (display == NULL) return;
GST_CAT_INFO (GST_CAT_DEFAULT, "on close");
GST_INFO ("on close");
gst_gl_display_lock (display);
display->isAlive = FALSE;
@ -1846,7 +1846,7 @@ gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
GstGLDisplayTex* tex = g_queue_pop_head (sub_texture_pool);
*pTexture = tex->texture;
g_free (tex);
GST_CAT_LOG (GST_CAT_DEFAULT, "get texture id:%d from the sub texture pool: %d",
GST_LOG ("get texture id:%d from the sub texture pool: %d",
*pTexture, key);
}
else
@ -1907,7 +1907,7 @@ gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri (GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
GST_CAT_LOG (GST_CAT_DEFAULT, "generate texture id:%d", *pTexture);
GST_LOG ("generate texture id:%d", *pTexture);
}
}
@ -1940,8 +1940,8 @@ gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
sub_texture_pool = g_queue_new ();
g_hash_table_insert (display->texture_pool, GUINT_TO_POINTER(key), sub_texture_pool);
GST_CAT_INFO (GST_CAT_DEFAULT, "one more sub texture pool inserted: %d ", key);
GST_CAT_INFO (GST_CAT_DEFAULT, "nb sub texture pools: %d", g_hash_table_size (display->texture_pool));
GST_INFO ("one more sub texture pool inserted: %d ", key);
GST_INFO ("nb sub texture pools: %d", g_hash_table_size (display->texture_pool));
}
//contruct a sub texture pool element
@ -1951,9 +1951,9 @@ gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
//add tex to the pool, it makes texture allocation reusable
g_queue_push_tail (sub_texture_pool, tex);
GST_CAT_LOG (GST_CAT_DEFAULT, "texture id:%d added to the sub texture pool: %d",
GST_LOG ("texture id:%d added to the sub texture pool: %d",
tex->texture, key);
GST_CAT_LOG (GST_CAT_DEFAULT, "%d texture(s) in the sub texture pool: %d",
GST_LOG ("%d texture(s) in the sub texture pool: %d",
g_queue_get_length (sub_texture_pool), key);
}
@ -1967,7 +1967,7 @@ gboolean gst_gl_display_texture_pool_func_clean (gpointer key, gpointer value, g
{
GstGLDisplayTex* tex = g_queue_pop_head (sub_texture_pool);
glDeleteTextures (1, &tex->texture);
GST_CAT_INFO (GST_CAT_DEFAULT, "texture id: %d deleted", tex->texture);
GST_INFO ("texture id: %d deleted", tex->texture);
g_free (tex);
}
@ -1989,11 +1989,11 @@ gst_gl_display_check_framebuffer_status(void)
break;
case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
GST_CAT_ERROR (GST_CAT_DEFAULT, "GL_FRAMEBUFFER_UNSUPPORTED_EXT");
GST_ERROR ("GL_FRAMEBUFFER_UNSUPPORTED_EXT");
break;
default:
GST_CAT_ERROR (GST_CAT_DEFAULT, "General FBO error");
GST_ERROR ("General FBO error");
}
}
@ -2389,7 +2389,7 @@ void gst_gl_display_thread_init_upload_fbo (GstGLDisplay *display)
//a texture must be attached to the FBO
GLuint fake_texture = 0;
GST_CAT_INFO (GST_CAT_DEFAULT, "Context %d, EXT_framebuffer_object supported: yes", display->glutWinId);
GST_INFO ("Context %d, EXT_framebuffer_object supported: yes", display->glutWinId);
//-- init intput frame buffer object (video -> GL)
@ -2433,7 +2433,7 @@ void gst_gl_display_thread_init_upload_fbo (GstGLDisplay *display)
else
{
//turn off the pipeline because Frame buffer object is a not present
GST_CAT_WARNING (GST_CAT_DEFAULT, "Context %d, EXT_framebuffer_object supported: no", display->glutWinId);
GST_WARNING ("Context %d, EXT_framebuffer_object supported: no", display->glutWinId);
display->isAlive = FALSE;
}
}