mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

glshader: enable glshader on GLES2

Browse source
This commit is contained in:
Matthew Waters 2014-06-25 18:23:52 +10:00
parent 13023f2975
commit 7797b15de7
3 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/gl/Makefile.am
View file

@ -7,8 +7,6 @@ AM_LIBS = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
# full opengl required # full opengl required
if USE_OPENGL if USE_OPENGL
OPENGL_SOURCES = \ OPENGL_SOURCES = \
gstglfiltershader.c \
gstglfiltershader.h \
gstglfilterblur.c \ gstglfilterblur.c \
gstglfilterblur.h \ gstglfilterblur.h \
gstglfiltersobel.c \ gstglfiltersobel.c \
@ -74,6 +72,8 @@ libgstopengl_la_SOURCES = \
gstglcolorscale.h \ gstglcolorscale.h \
gstglvideomixer.c \ gstglvideomixer.c \
gstglvideomixer.h \ gstglvideomixer.h \
gstglfiltershader.c \
gstglfiltershader.h \
$(OPENGL_SOURCES) $(OPENGL_SOURCES)
if HAVE_GRAPHENE if HAVE_GRAPHENE

7
ext/gl/gstglfiltershader.c
View file

@ -36,13 +36,6 @@
#include "config.h" #include "config.h"
#endif #endif
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <unistd.h>
#include <string.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/gl/gstglshadervariables.h> #include <gst/gl/gstglshadervariables.h>

11
ext/gl/gstopengl.c
View file

@ -49,6 +49,7 @@
#include "gstgleffects.h" #include "gstgleffects.h"
#include "gstglcolorscale.h" #include "gstglcolorscale.h"
#include "gstglvideomixer.h" #include "gstglvideomixer.h"
#include "gstglfiltershader.h"
#if HAVE_GRAPHENE #if HAVE_GRAPHENE
#include "gstgltransformation.h" #include "gstgltransformation.h"
#endif #endif
@ -60,7 +61,6 @@
#include "gstglfilterapp.h" #include "gstglfilterapp.h"
#include "gstglfilterblur.h" #include "gstglfilterblur.h"
#include "gstglfilterreflectedscreen.h" #include "gstglfilterreflectedscreen.h"
#include "gstglfiltershader.h"
#include "gstglfiltersobel.h" #include "gstglfiltersobel.h"
#include "gstgldeinterlace.h" #include "gstgldeinterlace.h"
#include "gstglmosaic.h" #include "gstglmosaic.h"
@ -129,6 +129,10 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, GST_TYPE_GL_VIDEO_MIXER)) { GST_RANK_NONE, GST_TYPE_GL_VIDEO_MIXER)) {
return FALSE; return FALSE;
} }
if (!gst_element_register (plugin, "glshader",
GST_RANK_NONE, gst_gl_filtershader_get_type ())) {
return FALSE;
}
#if GST_GL_HAVE_OPENGL #if GST_GL_HAVE_OPENGL
if (!gst_element_register (plugin, "gltestsrc", if (!gst_element_register (plugin, "gltestsrc",
GST_RANK_NONE, GST_TYPE_GL_TEST_SRC)) { GST_RANK_NONE, GST_TYPE_GL_TEST_SRC)) {
@ -140,11 +144,6 @@ plugin_init (GstPlugin * plugin)
return FALSE; return FALSE;
} }
if (!gst_element_register (plugin, "glshader",
GST_RANK_NONE, gst_gl_filtershader_get_type ())) {
return FALSE;
}
if (!gst_element_register (plugin, "glfiltersobel", if (!gst_element_register (plugin, "glfiltersobel",
GST_RANK_NONE, gst_gl_filtersobel_get_type ())) { GST_RANK_NONE, gst_gl_filtersobel_get_type ())) {
return FALSE; return FALSE;