mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-27 23:44:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

[075/906] indent

Browse source 
git-svn-id: svn://svn.wobow.com/GStreamer_playground/gst-plugins-gl@451 93df14bb-0f41-7a43-8087-d3e2a2f0e464
This commit is contained in:
Julien Isorce 2008-05-20 17:40:20 +00:00 committed by Tim-Philipp Müller
parent 60498e3370
commit 890ca473e1
1 changed files with 282 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -343,7 +343,7 @@ gst_gl_display_finalize (GObject *object)
if (g_hash_table_size (gst_gl_display_map) == 0)
{
g_thread_join (gst_gl_display_glutThread);
g_print ("Glut thread joined\n");
GST_DEBUG ("Glut thread joined");
gst_gl_display_glutThread = NULL;
g_async_queue_unref (gst_gl_display_messageQueue);
g_hash_table_unref (gst_gl_display_map);
@ -370,9 +370,9 @@ gst_gl_display_glutThreadFunc (GstGLDisplay *display)
gst_gl_display_glutCreateWindow (display);
gst_gl_display_unlock (display);
g_print ("Glut mainLoop start\n");
GST_DEBUG ("Glut mainLoop start");
glutMainLoop ();
g_print ("Glut mainLoop exited\n");
GST_DEBUG ("Glut mainLoop exited");
return NULL;
}
@ -405,13 +405,13 @@ gst_gl_display_glutCreateWindow (GstGLDisplay *display)
//Init glew
err = glewInit();
if (err != GLEW_OK)
g_print ("Error: %s\n", glewGetErrorString(err));
GST_DEBUG ("Error: %s", glewGetErrorString(err));
else
g_print ("Context %d, Using GLEW %s\n", glutWinId, glewGetString(GLEW_VERSION));
GST_DEBUG ("Context %d, Using GLEW %s", glutWinId, glewGetString(GLEW_VERSION));
if (GLEW_EXT_framebuffer_object)
{
g_print ("Context %d, EXT_framebuffer_object supported: yes\n", glutWinId);
GST_DEBUG ("Context %d, EXT_framebuffer_object supported: yes", glutWinId);
//-- init intput frame buffer object (video -> GL)
@ -561,7 +561,7 @@ gst_gl_display_glutCreateWindow (GstGLDisplay *display)
}
else
{
g_print ("Context %d, EXT_framebuffer_object supported: no\n", glutWinId);
GST_DEBUG ("Context %d, EXT_framebuffer_object supported: no", glutWinId);
g_assert_not_reached ();
}
@ -570,7 +570,7 @@ gst_gl_display_glutCreateWindow (GstGLDisplay *display)
{
gchar program[2048];
g_print ("Context %d, ARB_fragment_program supported: yes\n", glutWinId);
GST_DEBUG ("Context %d, ARB_fragment_program supported: yes", glutWinId);
//from video to texture
@ -600,7 +600,7 @@ gst_gl_display_glutCreateWindow (GstGLDisplay *display)
}
else
{
g_print ("Context %d, ARB_fragment_program supported: no\n", glutWinId);
GST_DEBUG ("Context %d, ARB_fragment_program supported: no", glutWinId);
g_assert_not_reached ();
}
@ -611,11 +611,11 @@ gst_gl_display_glutCreateWindow (GstGLDisplay *display)
//insert glut context to the map
display->glutWinId = glutWinId;
g_hash_table_insert (gst_gl_display_map, GINT_TO_POINTER (glutWinId), display);
g_hash_table_insert (gst_gl_display_map, GUINT_TO_POINTER ((guint64)glutWinId), display);
//check glut id validity
g_assert (glutGetWindow() == glutWinId);
g_print ("Context %d initialized\n", display->glutWinId);
GST_DEBUG ("Context %d initialized", display->glutWinId);
//release display constructor
g_cond_signal (display->cond_create);
@ -670,8 +670,8 @@ gst_gl_display_glutDestroyWindow (GstGLDisplay *display)
}
}
g_hash_table_remove (gst_gl_display_map, GINT_TO_POINTER (display->glutWinId));
g_print ("glut window destroyed: %d\n", display->glutWinId);
g_hash_table_remove (gst_gl_display_map, GINT_TO_POINTER ((guint64)display->glutWinId));
GST_DEBUG ("glut window destroyed: %d", display->glutWinId);
//if the map is empty, leaveMainloop and join the thread
if (g_hash_table_size (gst_gl_display_map) == 0)
@ -782,7 +782,7 @@ gst_gl_display_glut_idle (void)
gst_gl_display_glutDispatchAction (msg);
}
}
else g_print ("timeout reached in idle func\n");
else GST_DEBUG ("timeout reached in idle func");
}
@ -844,7 +844,7 @@ gst_gl_display_checkMsgValidity (GstGLDisplayMsg *msg)
case GST_GL_DISPLAY_ACTION_VIDEO:
case GST_GL_DISPLAY_ACTION_REDISPLAY:
//msg is out of date if the associated display is not in the map
if (!g_hash_table_lookup (gst_gl_display_map, GINT_TO_POINTER (msg->glutWinId)))
if (!g_hash_table_lookup (gst_gl_display_map, GINT_TO_POINTER ((guint64)msg->glutWinId)))
valid = FALSE;
break;
default:
@ -1064,7 +1064,7 @@ gst_gl_display_set_windowId (GstGLDisplay* display, gulong winId)
if (g_hash_table_size (gst_gl_display_map) == 0)
{
g_thread_join (gst_gl_display_glutThread);
g_print ("Glut thread joined when setting winId\n");
GST_DEBUG ("Glut thread joined when setting winId");
gst_gl_display_glutThread = NULL;
g_async_queue_unref (gst_gl_display_messageQueue);
g_hash_table_unref (gst_gl_display_map);
@ -1091,7 +1091,7 @@ gst_gl_display_onReshape(gint width, gint height)
//retrieve the display associated to the glut context
glutWinId = glutGetWindow ();
display = g_hash_table_lookup (gst_gl_display_map, GINT_TO_POINTER (glutWinId));
display = g_hash_table_lookup (gst_gl_display_map, GINT_TO_POINTER ((guint64)glutWinId));
//glutGetWindow return 0 if no windows exists, then g_hash_table_lookup return NULL
if (display == NULL) return;
@ -1123,7 +1123,7 @@ void gst_gl_display_draw(void)
//retrieve the display associated to the glut context
glutWinId = glutGetWindow ();
display = g_hash_table_lookup (gst_gl_display_map, GINT_TO_POINTER (glutWinId));
display = g_hash_table_lookup (gst_gl_display_map, GINT_TO_POINTER ((guint64)glutWinId));
//glutGetWindow return 0 if no windows exists, then g_hash_table_lookup return NULL
if (display == NULL) return;
@ -1200,12 +1200,12 @@ void gst_gl_display_onClose (void)
//retrieve the display associated to the glut context
glutWinId = glutGetWindow ();
display = g_hash_table_lookup (gst_gl_display_map, GINT_TO_POINTER (glutWinId));
display = g_hash_table_lookup (gst_gl_display_map, GINT_TO_POINTER ((guint64)glutWinId));
//glutGetWindow return 0 if no windows exists, then g_hash_table_lookup return NULL
if (display == NULL) return;
g_print ("on close\n");
GST_DEBUG ("on close");
gst_gl_display_lock (display);
display->isAlive = FALSE;
@ -1896,7 +1896,7 @@ gst_gl_display_loadGLSLprogram (gchar* textFProgram)
//Print the compilation log
glGetObjectParameterivARB (FHandle, GL_OBJECT_COMPILE_STATUS_ARB, &i);
glGetInfoLogARB (FHandle, sizeof(s)/sizeof(char), NULL, s);
g_print ("Compile Log: %s\n", s);
GST_DEBUG ("Compile Log: %s", s);
//link the shader
glAttachObjectARB (PHandle, FHandle);
@ -1904,7 +1904,7 @@ gst_gl_display_loadGLSLprogram (gchar* textFProgram)
//Print the link log
glGetInfoLogARB (PHandle, sizeof(s)/sizeof(char), NULL, s);
g_print ("Link Log: %s\n", s);
GST_DEBUG ("Link Log: %s", s);
return PHandle;
}
@ -1914,7 +1914,6 @@ gst_gl_display_loadGLSLprogram (gchar* textFProgram)
void
checkFramebufferStatus(void)
{
GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
switch(status)
@ -1923,10 +1922,10 @@ checkFramebufferStatus(void)
break;
case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
g_print("GL_FRAMEBUFFER_UNSUPPORTED_EXT\n");
GST_DEBUG("GL_FRAMEBUFFER_UNSUPPORTED_EXT");
break;
default:
g_print("General FBO error\n");
GST_DEBUG("General FBO error");
}
}