Commit 92d00d02 authored by Sebastian Dröge's avatar Sebastian Dröge 🍵

gl: Move GstGLMixer to the plugin for now

It depends on GstAggregator and we don't want to install headers
for that yet.

https://bugzilla.gnome.org/show_bug.cgi?id=732207
parent f701aa29
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
<xi:include href="xml/gstglfilter.xml"/> <xi:include href="xml/gstglfilter.xml"/>
<xi:include href="xml/gstglframebuffer.xml"/> <xi:include href="xml/gstglframebuffer.xml"/>
<xi:include href="xml/gstglmemory.xml"/> <xi:include href="xml/gstglmemory.xml"/>
<xi:include href="xml/gstglmixer.xml"/>
<xi:include href="xml/gstglshader.xml"/> <xi:include href="xml/gstglshader.xml"/>
<xi:include href="xml/gstglupload.xml"/> <xi:include href="xml/gstglupload.xml"/>
<xi:include href="xml/gstgluploadmeta.xml"/> <xi:include href="xml/gstgluploadmeta.xml"/>
......
...@@ -1041,38 +1041,6 @@ GST_CAPS_FEATURE_MEMORY_EGL_IMAGE ...@@ -1041,38 +1041,6 @@ GST_CAPS_FEATURE_MEMORY_EGL_IMAGE
<SUBSECTION Standard> <SUBSECTION Standard>
</SECTION> </SECTION>
<SECTION>
<FILE>gstglmixer</FILE>
GstGLMixerPad
GstGLMixerPadClass
GstGLMixerCollect
<TITLE>GstGLMixer</TITLE>
GstGLMixer
GstGLMixerClass
GstGLMixerProcessFunc
GstGLMixerSetCaps
GstGLMixerReset
GstGLMixerProcessTextures
GstGLMixerFrameData
gst_gl_mixer_process_textures
gst_gl_mixer_set_pad_type
<SUBSECTION Standard>
GstGLMixerPrivate
GST_GL_MIXER
GST_GL_MIXER_CLASS
GST_GL_MIXER_GET_CLASS
GST_GL_MIXER_PAD
GST_GL_MIXER_PAD_CLASS
gst_gl_mixer_get_type
gst_gl_mixer_pad_get_type
GST_IS_GL_MIXER
GST_IS_GL_MIXER_CLASS
GST_IS_GL_MIXER_PAD
GST_IS_GL_MIXER_PAD_CLASS
GST_TYPE_GL_MIXER
GST_TYPE_GL_MIXER_PAD
</SECTION>
<SECTION> <SECTION>
<FILE>gstglshader</FILE> <FILE>gstglshader</FILE>
gst_gl_shader_error_quark gst_gl_shader_error_quark
......
...@@ -33,7 +33,6 @@ gst_gl_display_get_type ...@@ -33,7 +33,6 @@ gst_gl_display_get_type
gst_gl_context_get_type gst_gl_context_get_type
gst_gl_filter_get_type gst_gl_filter_get_type
gst_gl_shader_get_type gst_gl_shader_get_type
gst_gl_mixer_get_type
gst_gl_buffer_pool_get_type gst_gl_buffer_pool_get_type
gst_gl_allocator_get_type gst_gl_allocator_get_type
gst_gl_window_get_type gst_gl_window_get_type
...@@ -25,6 +25,9 @@ OPENGL_SOURCES = \ ...@@ -25,6 +25,9 @@ OPENGL_SOURCES = \
gltestsrc.h \ gltestsrc.h \
gstgltestsrc.c \ gstgltestsrc.c \
gstgltestsrc.h \ gstgltestsrc.h \
gstglmixer.c \
gstglmixer.h \
gstglmixerpad.h \
gstglmosaic.c \ gstglmosaic.c \
gstglmosaic.h \ gstglmosaic.h \
effects/gstgleffectscurves.h \ effects/gstgleffectscurves.h \
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/gl/gl.h> #include <gst/gl/gl.h>
#include <gst/gl/gstglmixerpad.h> #include "gstglmixerpad.h"
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef _GST_GL_MOSAIC_H_ #ifndef _GST_GL_MOSAIC_H_
#define _GST_GL_MOSAIC_H_ #define _GST_GL_MOSAIC_H_
#include <gst/gl/gstglmixer.h> #include "gstglmixer.h"
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
#ifndef _GST_GL_VIDEO_MIXER_H_ #ifndef _GST_GL_VIDEO_MIXER_H_
#define _GST_GL_VIDEO_MIXER_H_ #define _GST_GL_VIDEO_MIXER_H_
#include <gst/gl/gstglmixer.h> #include "gstglmixer.h"
#include <gst/gl/gstglmixerpad.h> #include "gstglmixerpad.h"
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -14,7 +14,6 @@ libgstgl_@GST_API_VERSION@_la_SOURCES = \ ...@@ -14,7 +14,6 @@ libgstgl_@GST_API_VERSION@_la_SOURCES = \
gstglmemory.c \ gstglmemory.c \
gstglbufferpool.c \ gstglbufferpool.c \
gstglfilter.c \ gstglfilter.c \
gstglmixer.c \
gstglshader.c \ gstglshader.c \
gstglshadervariables.c \ gstglshadervariables.c \
gstglcolorconvert.c \ gstglcolorconvert.c \
...@@ -35,8 +34,6 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \ ...@@ -35,8 +34,6 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
gstglmemory.h \ gstglmemory.h \
gstglbufferpool.h \ gstglbufferpool.h \
gstglfilter.h \ gstglfilter.h \
gstglmixer.h \
gstglmixerpad.h \
gstglshadervariables.h \ gstglshadervariables.h \
gstglshader.h \ gstglshader.h \
gstglcolorconvert.h \ gstglcolorconvert.h \
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <gst/gl/gstglbufferpool.h> #include <gst/gl/gstglbufferpool.h>
#include <gst/gl/gstglframebuffer.h> #include <gst/gl/gstglframebuffer.h>
#include <gst/gl/gstglfilter.h> #include <gst/gl/gstglfilter.h>
#include <gst/gl/gstglmixer.h>
#include <gst/gl/gstglshadervariables.h> #include <gst/gl/gstglshadervariables.h>
#endif /* __GST_GL_H__ */ #endif /* __GST_GL_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