Commit fa1b6c75 authored by Gernot Ziegler Ziegler's avatar Gernot Ziegler Ziegler Committed by David Schleef

GL sink plugin. (Bug #147302)

Original commit message from CVS:
Patch from Gernot Ziegler <gz@lysator.liu.se> rewriting the
GL sink plugin.  (Bug #147302)
* configure.ac: Test for OpenGL
* sys/Makefile.am: Use test for OpenGL
* sys/glsink/Makefile.am:
* sys/glsink/glimagesink.c: rewrite
* sys/glsink/glimagesink.h: rewrite
parent abc2e390
2004-08-09 David Schleef <ds@schleef.org>
Patch from Gernot Ziegler <gz@lysator.liu.se> rewriting the
GL sink plugin. (Bug #147302)
* configure.ac: Test for OpenGL
* sys/Makefile.am: Use test for OpenGL
* sys/glsink/Makefile.am:
* sys/glsink/glimagesink.c: rewrite
* sys/glsink/glimagesink.h: rewrite
2004-08-09 David Schleef <ds@schleef.org>
* ext/sdl/sdlvideosink.c: (gst_sdlvideosink_base_init): Only allow
......
......@@ -524,9 +524,14 @@ GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
AC_CHECK_HEADER(linux/cdrom.h, HAVE_VCD="yes", HAVE_VCD="no")
])
dnl *** OpenGL ***
translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [
AC_CHECK_HEADER(GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
])
dnl *** CDROM Audio ***
translit(dnm, m, l) AM_CONDITIONAL(USE_CDROM, true)
GST_CHECK_FEATURE(CDROM, [CDROM Audio], cdrom, [
AC_CHECK_HEADERS(linux/cdrom.h) dnl linux
AC_CHECK_HEADERS(sys/cdio.h) dnl almost everything else
......
......@@ -70,9 +70,15 @@ else
CDROM_DIR=
endif
if USE_OPENGL
GL_DIR=glsink
else
GL_DIR=
endif
SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(QCAM_DIR) \
$(SUNAUDIO_DIR) $(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) \
$(XI_DIR) $(XV_DIR)
$(XI_DIR) $(XV_DIR) $(GL_DIR)
DIST_SUBDIRS=dxr3 oss osxaudio osxvideo qcam sunaudio v4l v4l2 vcd ximage \
xvimage glsink cdrom
......
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstglsink.la
plugin_LTLIBRARIES = libgstglimagesink.la
libgstglsink_la_SOURCES = gstglsink.c gstglxwindow.c gstgl_rgbimage.c gstgl_nvimage.c
libgstglsink_la_CFLAGS = $(GST_CFLAGS)
libgstglsink_la_LIBADD = $(X_LIBS) $(XVIDEO_LIBS) -lGL -lGLU -lglut
libgstglsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstglimagesink_la_SOURCES = glimagesink.c
libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL -lGLU\
$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = glimagesink.h
noinst_HEADERS = gstglsink.h
This diff is collapsed.
/* GStreamer
* Copyright (C) <2003> Julien Moutte <julien@moutte.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GST_GLIMAGESINK_H__
#define __GST_GLIMAGESINK_H__
#include <gst/video/videosink.h>
#include <X11/Xlib.h>
#include <GL/glx.h>
#include <GL/gl.h>
#include <GL/glu.h>
#include <string.h>
#include <math.h>
G_BEGIN_DECLS
#define GST_TYPE_GLIMAGESINK \
(gst_glimagesink_get_type())
#define GST_GLIMAGESINK(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_GLIMAGESINK, GstGLImageSink))
#define GST_GLIMAGESINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_GLIMAGESINK, GstGLImageSink))
#define GST_IS_GLIMAGESINK(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_GLIMAGESINK))
#define GST_IS_GLIMAGESINK_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_GLIMAGESINK))
typedef struct _GstXContext GstXContext;
typedef struct _GstGLWindow GstGLWindow;
typedef struct _GstGLImage GstGLImage;
typedef struct _GstGLImageSink GstGLImageSink;
typedef struct _GstGLImageSinkClass GstGLImageSinkClass;
/* Global X Context stuff */
struct _GstXContext {
Display *disp;
Screen *screen;
gint screen_num;
Visual *visual;
XVisualInfo *visualinfo;
Window root;
GLXContext glx;
gulong white, black;
gint depth;
gint bpp;
gint endianness;
gboolean use_xshm;
GstCaps *caps;
};
/* XWindow stuff */
struct _GstGLWindow {
XSetWindowAttributes attr;
Window win;
gint width, height;
gboolean internal;
};
/* XImage stuff */
struct _GstGLImage {
/* Reference to the ximagesink we belong to */
GstGLImageSink *glimagesink;
GLuint texid;
char *data;
gint width, height, size;
};
struct _GstGLImageSink {
/* Our element stuff */
GstVideoSink videosink;
char *display_name;
GstXContext *xcontext;
GstGLWindow *window;
GstGLImage *glimage;
GstGLImage *cur_image;
gdouble framerate;
GMutex *x_lock;
gint pixel_width, pixel_height; /* Unused */
GstClockTime time;
GMutex *pool_lock;
GSList *image_pool;
guint pointer_x, pointer_y;
gboolean pointer_moved;
gboolean pointer_button[5];
gboolean synchronous;
gboolean signal_handoffs;
};
struct _GstGLImageSinkClass {
GstVideoSinkClass parent_class;
/* signals */
void (*handoff) (GstElement *element, GstBuffer *buf, GstPad *pad);
void (*bufferalloc) (GstElement *element, GstBuffer *buf, GstPad *pad);
};
GType gst_glimagesink_get_type(void);
G_END_DECLS
#endif /* __GST_GLIMAGESINK_H__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment