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

gl: fix the use of always-defined macros

Browse source 
After 2a0f0399ae GST_GL_* macros are always
defined to 0 or 1. Don't use #ifdef ... or #if defined() on them.

https://bugzilla.gnome.org/show_bug.cgi?id=726591
This commit is contained in:
Руслан Ижбулатов 2014-03-18 00:08:50 +00:00 committed by julien isorce
parent 26049ca402
commit 2a8f52a976
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/egl/gstglcontext_egl.c
View file

@ -173,7 +173,7 @@ gst_gl_context_egl_choose_config (GstGLContextEGL * egl,
config_attrib[i++] = EGL_OPENGL_ES2_BIT; config_attrib[i++] = EGL_OPENGL_ES2_BIT;
else else
config_attrib[i++] = EGL_OPENGL_BIT; config_attrib[i++] = EGL_OPENGL_BIT;
#if defined(USE_EGL_RPI) && defined(GST_GL_HAVE_WINDOW_WAYLAND) #if defined(USE_EGL_RPI) && GST_GL_HAVE_WINDOW_WAYLAND
/* The configurations r=5 g=6 b=5 seems to be buggy whereas /* The configurations r=5 g=6 b=5 seems to be buggy whereas
* it works when using dispmanx directly */ * it works when using dispmanx directly */
config_attrib[i++] = EGL_BUFFER_SIZE; config_attrib[i++] = EGL_BUFFER_SIZE;
@ -485,7 +485,7 @@ gst_gl_context_egl_get_proc_address (GstGLContext * context, const gchar * name)
gpointer result = NULL; gpointer result = NULL;
/* FIXME: On Android this returns wrong addresses for non-EGL functions */ /* FIXME: On Android this returns wrong addresses for non-EGL functions */
#ifdef GST_GL_HAVE_WINDOW_ANDROID #if GST_GL_HAVE_WINDOW_ANDROID
if (!(result = gst_gl_context_default_get_proc_address (context, name))) { if (!(result = gst_gl_context_default_get_proc_address (context, name))) {
if (g_str_has_prefix (name, "egl")) if (g_str_has_prefix (name, "egl"))
result = eglGetProcAddress (name); result = eglGetProcAddress (name);

8
gst-libs/gst/gl/glprototypes/gstgl_compat.h
View file

@ -24,16 +24,16 @@
#include <gst/gl/gstglconfig.h> #include <gst/gl/gstglconfig.h>
/* undefined typedefs */ /* undefined typedefs */
#ifndef GST_GL_HAVE_GLEGLIMAGEOES #if !GST_GL_HAVE_GLEGLIMAGEOES
typedef gpointer GLeglImageOES; typedef gpointer GLeglImageOES;
#endif #endif
#ifndef GST_GL_HAVE_GLCHAR #if !GST_GL_HAVE_GLCHAR
typedef gchar GLchar; typedef gchar GLchar;
#endif #endif
#ifndef GST_GL_HAVE_GLSIZEIPTR #if !GST_GL_HAVE_GLSIZEIPTR
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
#endif #endif
#ifndef GST_GL_HAVE_GLINTPTR #if !GST_GL_HAVE_GLINTPTR
typedef ptrdiff_t GLintptr; typedef ptrdiff_t GLintptr;
#endif #endif

12
tests/examples/gtk/gstgtk.c
View file

@ -24,13 +24,13 @@
#include <gst/gl/gl.h> #include <gst/gl/gl.h>
#include "gstgtk.h" #include "gstgtk.h"
#if defined(GST_GL_HAVE_WINDOW_WIN32) && defined(GDK_WINDOWING_WIN32) #if GST_GL_HAVE_WINDOW_WIN32 && GDK_WINDOWING_WIN32
#include <gdk/gdkwin32.h> #include <gdk/gdkwin32.h>
#endif #endif
#if defined(GST_GL_HAVE_WINDOW_X11) && defined(GDK_WINDOWING_X11) #if GST_GL_HAVE_WINDOW_X11 && GDK_WINDOWING_X11
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif #endif
#if defined(GST_GL_HAVE_WINDOW_COCOA) && defined(GDK_WINDOWING_QUARTZ) #if GST_GL_HAVE_WINDOW_COCOA && GDK_WINDOWING_QUARTZ
#include <gdk/gdkquartz.h> #include <gdk/gdkquartz.h>
#endif #endif
@ -46,21 +46,21 @@ gst_video_overlay_set_gtk_window (GstVideoOverlay * videooverlay,
window = gtk_widget_get_window (widget); window = gtk_widget_get_window (widget);
display = gdk_window_get_display (window); display = gdk_window_get_display (window);
#if defined(GST_GL_HAVE_WINDOW_WIN32) && defined(GDK_WINDOWING_WIN32) #if GST_GL_HAVE_WINDOW_WIN32 && GDK_WINDOWING_WIN32
if (GDK_IS_WIN32_DISPLAY (display) && (!user_choice if (GDK_IS_WIN32_DISPLAY (display) && (!user_choice
|| g_strcmp0 (user_choice, "win32") == 0)) { || g_strcmp0 (user_choice, "win32") == 0)) {
gst_video_overlay_set_window_handle (videooverlay, gst_video_overlay_set_window_handle (videooverlay,
(guintptr) GDK_WINDOW_HWND (window)); (guintptr) GDK_WINDOW_HWND (window));
} else } else
#endif #endif
#if defined(GST_GL_HAVE_WINDOW_COCOA) && defined(GDK_WINDOWING_QUARTZ) #if GST_GL_HAVE_WINDOW_COCOA && GDK_WINDOWING_QUARTZ
if (GDK_IS_QUARTZ_DISPLAY (display) && (!user_choice if (GDK_IS_QUARTZ_DISPLAY (display) && (!user_choice
|| g_strcmp0 (user_choice, "cocoa") == 0)) { || g_strcmp0 (user_choice, "cocoa") == 0)) {
gst_video_overlay_set_window_handle (videooverlay, (guintptr) gst_video_overlay_set_window_handle (videooverlay, (guintptr)
gdk_quartz_window_get_nswindow (window)); gdk_quartz_window_get_nswindow (window));
} else } else
#endif #endif
#if defined(GST_GL_HAVE_WINDOW_X11) && defined(GDK_WINDOWING_X11) #if GST_GL_HAVE_WINDOW_X11 && GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display) && (!user_choice if (GDK_IS_X11_DISPLAY (display) && (!user_choice
|| g_strcmp0 (user_choice, "x11") == 0)) { || g_strcmp0 (user_choice, "x11") == 0)) {
gst_video_overlay_set_window_handle (videooverlay, GDK_WINDOW_XID (window)); gst_video_overlay_set_window_handle (videooverlay, GDK_WINDOW_XID (window));