mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 02:58:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: enable glvideomixer on GLES2

Browse source
This commit is contained in:
Julien Isorce 2014-06-22 13:14:27 +01:00 committed by Tim-Philipp Müller
parent d86208e6ad
commit c18a109b42
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/gl/Makefile.am
View file

@ -29,8 +29,6 @@ OPENGL_SOURCES = \
gstgltestsrc.h \ gstgltestsrc.h \
gstglmosaic.c \ gstglmosaic.c \
gstglmosaic.h \ gstglmosaic.h \
gstglvideomixer.c \
gstglvideomixer.h \
effects/gstgleffectscurves.h \ effects/gstgleffectscurves.h \
effects/gstgleffectstretch.c \ effects/gstgleffectstretch.c \
effects/gstgleffecttunnel.c \ effects/gstgleffecttunnel.c \
@ -74,6 +72,8 @@ libgstopengl_la_SOURCES = \
effects/gstgleffectsqueeze.c \ effects/gstgleffectsqueeze.c \
gstglcolorscale.c \ gstglcolorscale.c \
gstglcolorscale.h \ gstglcolorscale.h \
gstglvideomixer.c \
gstglvideomixer.h \
$(OPENGL_SOURCES) $(OPENGL_SOURCES)
if HAVE_GRAPHENE if HAVE_GRAPHENE

3
ext/gl/gstglvideomixer.c
View file

@ -81,6 +81,9 @@ static const gchar *video_mixer_v_src =
/* fragment source */ /* fragment source */
static const gchar *video_mixer_f_src = static const gchar *video_mixer_f_src =
"#ifdef GL_ES\n"
"precision mediump float;\n"
"#endif\n"
"uniform sampler2D texture; \n" "uniform sampler2D texture; \n"
"uniform float alpha;\n" "uniform float alpha;\n"
"varying vec2 v_texCoord; \n" "varying vec2 v_texCoord; \n"

12
ext/gl/gstopengl.c
View file

@ -48,6 +48,7 @@
#include "gstglfiltercube.h" #include "gstglfiltercube.h"
#include "gstgleffects.h" #include "gstgleffects.h"
#include "gstglcolorscale.h" #include "gstglcolorscale.h"
#include "gstglvideomixer.h"
#if HAVE_GRAPHENE #if HAVE_GRAPHENE
#include "gstgltransformation.h" #include "gstgltransformation.h"
#endif #endif
@ -63,7 +64,6 @@
#include "gstglfiltersobel.h" #include "gstglfiltersobel.h"
#include "gstgldeinterlace.h" #include "gstgldeinterlace.h"
#include "gstglmosaic.h" #include "gstglmosaic.h"
#include "gstglvideomixer.h"
#if HAVE_PNG #if HAVE_PNG
#include "gstgldifferencematte.h" #include "gstgldifferencematte.h"
#include "gstglbumper.h" #include "gstglbumper.h"
@ -124,6 +124,11 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, GST_TYPE_GL_COLORSCALE)) { GST_RANK_NONE, GST_TYPE_GL_COLORSCALE)) {
return FALSE; return FALSE;
} }
if (!gst_element_register (plugin, "glvideomixer",
GST_RANK_NONE, GST_TYPE_GL_VIDEO_MIXER)) {
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)) {
@ -174,11 +179,6 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, GST_TYPE_GL_MOSAIC)) { GST_RANK_NONE, GST_TYPE_GL_MOSAIC)) {
return FALSE; return FALSE;
} }
if (!gst_element_register (plugin, "glvideomixer",
GST_RANK_NONE, GST_TYPE_GL_VIDEO_MIXER)) {
return FALSE;
}
#if HAVE_PNG #if HAVE_PNG
if (!gst_element_register (plugin, "gldifferencematte", if (!gst_element_register (plugin, "gldifferencematte",
GST_RANK_NONE, gst_gl_differencematte_get_type ())) { GST_RANK_NONE, gst_gl_differencematte_get_type ())) {