Commit ea167016 authored by David Schleef's avatar David Schleef

revival of glimagesink. Kind of works.

Original commit message from CVS:
* configure.ac:
* sys/Makefile.am:
* sys/glsink/Makefile.am:
* sys/glsink/glimagesink.c:
* sys/glsink/glimagesink.h:
revival of glimagesink.  Kind of works.
parent b0ebf7d6
2006-01-27 David Schleef <ds@schleef.org>
* configure.ac:
* sys/Makefile.am:
* sys/glsink/Makefile.am:
* sys/glsink/glimagesink.c:
* sys/glsink/glimagesink.h:
revival of glimagesink. Kind of works.
2006-01-27 Tim-Philipp Müller <tim at centricular dot net>
* ext/faad/gstfaad.c: (gst_faad_setcaps),
......
......@@ -319,6 +319,14 @@ dnl ###########################
dnl # Configure external libs #
dnl ###########################
#dnl *** cairo ***
#translit(dnm, m, l) AM_CONDITIONAL(USE_CAIRO, true)
#GST_CHECK_FEATURE(CAIRO, [cairo plug-in], cairo, [
# PKG_CHECK_MODULES(CAIRO, cairo >= 1.0 glitz-glx, HAVE_CAIRO=yes, HAVE_CAIRO=no)
# AC_SUBST(CAIRO_CFLAGS)
# AC_SUBST(CAIRO_LIBS)
#])
dnl **** DirectFB ****
translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTFB, true)
GST_CHECK_FEATURE(DIRECTFB, [directfb], dfbvideosink , [
......@@ -536,6 +544,13 @@ GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
AC_SUBST(GSM_LIBS)
])
dnl *** OpenGL ***
translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [
GST_CHECK_LIBHEADER(GL, GLU, glTexImage2D,,
GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
])
dnl *** XVID ***
translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true)
GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
......@@ -633,13 +648,13 @@ gst/speed/Makefile
gst/qtdemux/Makefile
gst/tta/Makefile
sys/Makefile
sys/glsink/Makefile
examples/Makefile
examples/directfb/Makefile
ext/Makefile
ext/directfb/Makefile
ext/faac/Makefile
ext/faad/Makefile
ext/swfdec/Makefile
ext/wavpack/Makefile
ext/ivorbis/Makefile
ext/gsm/Makefile
......@@ -649,6 +664,7 @@ ext/dts/Makefile
ext/divx/Makefile
ext/musepack/Makefile
ext/sdl/Makefile
ext/swfdec/Makefile
ext/xvid/Makefile
docs/Makefile
docs/plugins/Makefile
......
......@@ -28,12 +28,12 @@
# CDROM_DIR=
# endif
# if USE_OPENGL
# GL_DIR=glsink
# else
# GL_DIR=
# endif
if USE_OPENGL
GL_DIR=glsink
else
GL_DIR=
endif
SUBDIRS =
SUBDIRS = $(GL_DIR)
DIST_SUBDIRS =
DIST_SUBDIRS = glsink
......@@ -2,9 +2,9 @@
plugin_LTLIBRARIES = libgstglimagesink.la
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_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS)
libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL -lGLU \
$(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = glimagesink.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