mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

[331/906] indent and fix some compiler warnings

Browse source
This commit is contained in:
Julien Isorce 2009-04-18 08:40:51 -04:00 committed by Matthew Waters
parent 87a1652216
commit f735c06c4a
3 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gst-libs/gst/gl/gstglwindow_x11.c
View file

@ -379,8 +379,8 @@ gst_gl_window_new (gint width, gint height, guint64 external_gl_context)
XSetWMProtocols (priv->device, priv->internal_win_id, wm_atoms, 2);
priv->gl_context =
glXCreateContext (priv->device, priv->visual_info,
(GLXContext) external_gl_context, TRUE);
glXCreateContext (priv->device, priv->visual_info,
(GLXContext) (guint) external_gl_context, TRUE);
g_debug ("gl context id: %ld\n", (gulong) priv->gl_context);
@ -623,13 +623,13 @@ gst_gl_window_run_loop (GstGLWindow * window)
if (priv->running) {
#if SIZEOF_VOID_P == 8
GstGLWindowCB custom_cb =
(GstGLWindowCB) (((event.xclient.
data.l[0] & 0xffffffff) << 32) | (event.xclient.
data.l[1] & 0xffffffff));
(GstGLWindowCB) (((event.xclient.data.
l[0] & 0xffffffff) << 32) | (event.xclient.data.
l[1] & 0xffffffff));
gpointer custom_data =
(gpointer) (((event.xclient.
data.l[2] & 0xffffffff) << 32) | (event.xclient.
data.l[3] & 0xffffffff));
(gpointer) (((event.xclient.data.
l[2] & 0xffffffff) << 32) | (event.xclient.data.
l[3] & 0xffffffff));
#else
GstGLWindowCB custom_cb = (GstGLWindowCB) event.xclient.data.l[0];
gpointer custom_data = (gpointer) event.xclient.data.l[1];
@ -666,13 +666,13 @@ gst_gl_window_run_loop (GstGLWindow * window)
&& event.xclient.message_type == wm_quit_loop) {
#if SIZEOF_VOID_P == 8
GstGLWindowCB destroy_cb =
(GstGLWindowCB) (((event.xclient.
data.l[0] & 0xffffffff) << 32) | (event.xclient.
data.l[1] & 0xffffffff));
(GstGLWindowCB) (((event.xclient.data.
l[0] & 0xffffffff) << 32) | (event.xclient.data.
l[1] & 0xffffffff));
gpointer destroy_data =
(gpointer) (((event.xclient.
data.l[2] & 0xffffffff) << 32) | (event.xclient.
data.l[3] & 0xffffffff));
(gpointer) (((event.xclient.data.
l[2] & 0xffffffff) << 32) | (event.xclient.data.
l[3] & 0xffffffff));
#else
GstGLWindowCB destroy_cb = (GstGLWindowCB) event.xclient.data.l[0];
gpointer destroy_data = (gpointer) event.xclient.data.l[1];
@ -689,13 +689,13 @@ gst_gl_window_run_loop (GstGLWindow * window)
while (XCheckTypedEvent (priv->device, ClientMessage, &pending_event)) {
#if SIZEOF_VOID_P == 8
GstGLWindowCB custom_cb =
(GstGLWindowCB) (((event.xclient.
data.l[0] & 0xffffffff) << 32) | (event.xclient.
data.l[1] & 0xffffffff));
(GstGLWindowCB) (((event.xclient.data.
l[0] & 0xffffffff) << 32) | (event.xclient.data.
l[1] & 0xffffffff));
gpointer custom_data =
(gpointer) (((event.xclient.
data.l[2] & 0xffffffff) << 32) | (event.xclient.
data.l[3] & 0xffffffff));
(gpointer) (((event.xclient.data.
l[2] & 0xffffffff) << 32) | (event.xclient.data.
l[3] & 0xffffffff));
#else
GstGLWindowCB custom_cb = (GstGLWindowCB) event.xclient.data.l[0];
gpointer custom_data = (gpointer) event.xclient.data.l[1];

4
gst-libs/gst/gl/gstglwindow_x11ES2.c
View file

@ -395,8 +395,8 @@ gst_gl_window_new (gint width, gint height, guint64 external_gl_context)
(gulong) priv->gl_display, EGLErrorString ());
priv->gl_context =
eglCreateContext (priv->gl_display, config, (EGLContext) external_gl_context,
context_attrib);
eglCreateContext (priv->gl_display, config,
(EGLContext) (guint) external_gl_context, context_attrib);
if (priv->gl_context != EGL_NO_CONTEXT)
g_debug ("gl context created: %ld\n", (gulong) priv->gl_context);
else

15
gst/gl/gstglupload.c
View file

@ -94,11 +94,10 @@ static GstStaticPadTemplate gst_gl_upload_sink_pad_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
GST_VIDEO_CAPS_RGB ";"
GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";"
GST_VIDEO_CAPS_RGBx ";"
GST_VIDEO_CAPS_RGBA ";"
GST_VIDEO_CAPS_BGR ";"
GST_VIDEO_CAPS_BGR ";"
GST_VIDEO_CAPS_BGRx ";"
GST_VIDEO_CAPS_BGRA ";"
GST_VIDEO_CAPS_xRGB ";"
@ -112,8 +111,7 @@ static GstStaticPadTemplate gst_gl_upload_sink_pad_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
GST_VIDEO_CAPS_RGB ";"
GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB ";"
GST_VIDEO_CAPS_RGBx ";"
GST_VIDEO_CAPS_RGBA ";"
GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }"))
@ -189,10 +187,10 @@ gst_gl_upload_class_init (GstGLUploadClass * klass)
gst_gl_upload_prepare_output_buffer;
g_object_class_install_property (gobject_class, PROP_EXTERNAL_OPENGL_CONTEXT,
g_param_spec_uint64 ("external_opengl_context",
g_param_spec_uint64 ("external_opengl_context",
"External OpenGL context",
"Give an external OpenGL context with which to share textures",
0, _UI64_MAX, 0, G_PARAM_WRITABLE));
0, G_MAXINT64, 0, G_PARAM_WRITABLE));
}
static void
@ -451,8 +449,7 @@ gst_gl_upload_set_caps (GstBaseTransform * bt, GstCaps * incaps,
//init unvisible opengl context
gst_gl_display_create_context (upload->display,
upload->gl_width, upload->gl_height,
upload->external_gl_context);
upload->gl_width, upload->gl_height, upload->external_gl_context);
//init colorspace conversion if needed
gst_gl_display_init_upload (upload->display, upload->video_format,