opengl: build/provide glstereomix/split on gles only systems

This commit is contained in:
Matthew Waters 2015-10-27 00:36:41 +11:00
parent f1ced59ccb
commit de808c6439
2 changed files with 19 additions and 17 deletions

View file

@ -35,7 +35,10 @@ libgstopengl_la_SOURCES = \
gstglmixer.c \
gstglvideomixer.c \
gstglfiltershader.c \
gstglfilterapp.c
gstglfilterapp.c \
gstglviewconvert.c \
gstglstereosplit.c \
gstglstereomix.c
noinst_HEADERS = \
gstglbasemixer.h \
@ -54,16 +57,16 @@ noinst_HEADERS = \
gstglmixer.h \
gstglvideomixer.h \
gstglfiltershader.h \
gstglfilterapp.h
gstglfilterapp.h \
gstglstereosplit.h \
gstglstereomix.h \
gstglviewconvert.h
# full opengl required
if USE_OPENGL
libgstopengl_la_SOURCES += \
gstglfilterglass.c \
gstgldeinterlace.c \
gstglviewconvert.c \
gstglstereosplit.c \
gstglstereomix.c \
gltestsrc.c \
gstgltestsrc.c \
gstglmosaic.c
@ -71,9 +74,6 @@ libgstopengl_la_SOURCES += \
noinst_HEADERS += \
gstglfilterglass.h \
gstgldeinterlace.h \
gstglstereosplit.h \
gstglstereomix.h \
gstglviewconvert.h \
gltestsrc.h \
gstgltestsrc.h \
gstglmosaic.h \

View file

@ -60,6 +60,7 @@
#include "gstglfilterapp.h"
#include "gstglstereosplit.h"
#include "gstglstereomix.h"
#include "gstglviewconvert.h"
#if HAVE_GRAPHENE
#include "gstgltransformation.h"
@ -75,7 +76,6 @@
#include "gstglfilterglass.h"
/* #include "gstglfilterreflectedscreen.h" */
#include "gstgldeinterlace.h"
#include "gstglviewconvert.h"
#include "gstglmosaic.h"
#if HAVE_PNG
#include "gstgldifferencematte.h"
@ -204,6 +204,16 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, GST_TYPE_GL_VIEW_CONVERT_ELEMENT)) {
return FALSE;
}
if (!gst_element_register (plugin, "glstereosplit",
GST_RANK_NONE, GST_TYPE_GL_STEREOSPLIT)) {
return FALSE;
}
if (!gst_element_register (plugin, "glstereomix",
GST_RANK_NONE, GST_TYPE_GL_STEREO_MIX)) {
return FALSE;
}
#if HAVE_JPEG
#if HAVE_PNG
if (!gst_element_register (plugin, "gloverlay",
@ -249,14 +259,6 @@ plugin_init (GstPlugin * plugin)
}
#endif
#endif /* HAVE_PNG */
if (!gst_element_register (plugin, "glstereosplit",
GST_RANK_NONE, GST_TYPE_GL_STEREOSPLIT)) {
return FALSE;
}
if (!gst_element_register (plugin, "glstereomix",
GST_RANK_NONE, GST_TYPE_GL_STEREO_MIX)) {
return FALSE;
}
#endif /* GST_GL_HAVE_OPENGL */
#if GST_GL_HAVE_WINDOW_COCOA
if (!gst_element_register (plugin, "caopengllayersink",