Commit f9ced7df authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

Move capsfilter element from -bad to -good

Hook up moved files to the build infrastructure and docs.

Fixes #617739.
parent 5aacc8dd
...@@ -138,6 +138,7 @@ EXTRA_HFILES = \ ...@@ -138,6 +138,7 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/avi/gstavimux.h \ $(top_srcdir)/gst/avi/gstavimux.h \
$(top_srcdir)/gst/avi/gstavisubtitle.h \ $(top_srcdir)/gst/avi/gstavisubtitle.h \
$(top_srcdir)/gst/cutter/gstcutter.h \ $(top_srcdir)/gst/cutter/gstcutter.h \
$(top_srcdir)/gst/debugutils/gstcapssetter.h \
$(top_srcdir)/gst/debugutils/gsttaginject.h \ $(top_srcdir)/gst/debugutils/gsttaginject.h \
$(top_srcdir)/gst/debugutils/progressreport.h \ $(top_srcdir)/gst/debugutils/progressreport.h \
$(top_srcdir)/gst/deinterlace/gstdeinterlace.h \ $(top_srcdir)/gst/deinterlace/gstdeinterlace.h \
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<xi:include href="xml/element-cairotextoverlay.xml" /> <xi:include href="xml/element-cairotextoverlay.xml" />
<xi:include href="xml/element-cairotimeoverlay.xml" /> <xi:include href="xml/element-cairotimeoverlay.xml" />
<xi:include href="xml/element-cairorender.xml" /> <xi:include href="xml/element-cairorender.xml" />
<xi:include href="xml/element-capssetter.xml" />
<xi:include href="xml/element-cmmldec.xml" /> <xi:include href="xml/element-cmmldec.xml" />
<xi:include href="xml/element-cmmlenc.xml" /> <xi:include href="xml/element-cmmlenc.xml" />
<xi:include href="xml/element-cutter.xml" /> <xi:include href="xml/element-cutter.xml" />
......
...@@ -465,6 +465,20 @@ GST_CAIRO_RENDER_CLASS ...@@ -465,6 +465,20 @@ GST_CAIRO_RENDER_CLASS
gst_cairo_render_get_type gst_cairo_render_get_type
</SECTION> </SECTION>
<SECTION>
<FILE>element-capssetter</FILE>
<TITLE>capssetter</TITLE>
GstCapsSetter
<SUBSECTION Standard>
GstCapsSetterClass
GST_TYPE_CAPS_SETTER
GST_CAPS_SETTER
GST_IS_CAPS_SETTER
GST_CAPS_SETTER_CLASS
GST_IS_CAPS_SETTER_CLASS
gst_caps_setter_get_type
</SECTION>
<SECTION> <SECTION>
<FILE>element-cmmldec</FILE> <FILE>element-cmmldec</FILE>
<TITLE>cmmldec</TITLE> <TITLE>cmmldec</TITLE>
......
...@@ -20638,3 +20638,32 @@ ...@@ -20638,3 +20638,32 @@
<DEFAULT>FALSE</DEFAULT> <DEFAULT>FALSE</DEFAULT>
</ARG> </ARG>
<ARG>
<NAME>GstCapsSetter::caps</NAME>
<TYPE>GstCaps*</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Merge caps</NICK>
<BLURB>Merge these caps (thereby overwriting) in the stream.</BLURB>
<DEFAULT></DEFAULT>
</ARG>
<ARG>
<NAME>GstCapsSetter::join</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Join</NICK>
<BLURB>Match incoming caps' mime-type to mime-type of provided caps.</BLURB>
<DEFAULT>TRUE</DEFAULT>
</ARG>
<ARG>
<NAME>GstCapsSetter::replace</NAME>
<TYPE>gboolean</TYPE>
<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Replace</NICK>
<BLURB>Drop fields of incoming caps.</BLURB>
<DEFAULT>FALSE</DEFAULT>
</ARG>
...@@ -96,6 +96,7 @@ GObject ...@@ -96,6 +96,7 @@ GObject
GstAlphaColor GstAlphaColor
GstVideoBox GstVideoBox
GstBreakMyData GstBreakMyData
GstCapsSetter
GstNavSeek GstNavSeek
GstProgressReport GstProgressReport
GstTagInject GstTagInject
......
...@@ -30,6 +30,27 @@ ...@@ -30,6 +30,27 @@
</caps> </caps>
</pads> </pads>
</element> </element>
<element>
<name>capssetter</name>
<longname>CapsSetter</longname>
<class>Generic</class>
<description>Set/merge caps on stream</description>
<author>Mark Nauwelaerts &lt;mnauw@users.sourceforge.net&gt;</author>
<pads>
<caps>
<name>src</name>
<direction>source</direction>
<presence>always</presence>
<details>ANY</details>
</caps>
<caps>
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
<details>ANY</details>
</caps>
</pads>
</element>
<element> <element>
<name>navseek</name> <name>navseek</name>
<longname>Seek based on left-right arrows</longname> <longname>Seek based on left-right arrows</longname>
......
...@@ -8,6 +8,7 @@ plugin_LTLIBRARIES = $(EFENCE_PLUGIN) libgstdebug.la libgstnavigationtest.la ...@@ -8,6 +8,7 @@ plugin_LTLIBRARIES = $(EFENCE_PLUGIN) libgstdebug.la libgstnavigationtest.la
noinst_HEADERS = \ noinst_HEADERS = \
efence.h \ efence.h \
gstcapssetter.h \
gstnavigationtest.h \ gstnavigationtest.h \
gstnavseek.h \ gstnavseek.h \
gstpushfilesrc.h \ gstpushfilesrc.h \
...@@ -32,6 +33,7 @@ libgstnavigationtest_la_LIBTOOLFLAGS = --tag=disable-static ...@@ -32,6 +33,7 @@ libgstnavigationtest_la_LIBTOOLFLAGS = --tag=disable-static
libgstdebug_la_SOURCES = \ libgstdebug_la_SOURCES = \
gstdebug.c \ gstdebug.c \
breakmydata.c \ breakmydata.c \
gstcapssetter.c \
gstnavseek.c \ gstnavseek.c \
gstpushfilesrc.c \ gstpushfilesrc.c \
gsttaginject.c \ gsttaginject.c \
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <gst/gst.h> #include <gst/gst.h>
GType gst_break_my_data_get_type (void); GType gst_break_my_data_get_type (void);
GType gst_caps_setter_get_type (void);
GType gst_rnd_buffer_size_get_type (void); GType gst_rnd_buffer_size_get_type (void);
GType gst_navseek_get_type (void); GType gst_navseek_get_type (void);
GType gst_progress_report_get_type (void); GType gst_progress_report_get_type (void);
...@@ -39,6 +40,8 @@ plugin_init (GstPlugin * plugin) ...@@ -39,6 +40,8 @@ plugin_init (GstPlugin * plugin)
{ {
if (!gst_element_register (plugin, "breakmydata", GST_RANK_NONE, if (!gst_element_register (plugin, "breakmydata", GST_RANK_NONE,
gst_break_my_data_get_type ()) gst_break_my_data_get_type ())
|| !gst_element_register (plugin, "capssetter", GST_RANK_NONE,
gst_caps_setter_get_type ())
|| !gst_element_register (plugin, "rndbuffersize", GST_RANK_NONE, || !gst_element_register (plugin, "rndbuffersize", GST_RANK_NONE,
gst_rnd_buffer_size_get_type ()) gst_rnd_buffer_size_get_type ())
|| !gst_element_register (plugin, "navseek", GST_RANK_NONE, || !gst_element_register (plugin, "navseek", GST_RANK_NONE,
......
...@@ -107,6 +107,7 @@ check_PROGRAMS = \ ...@@ -107,6 +107,7 @@ check_PROGRAMS = \
elements/audiowsinclimit \ elements/audiowsinclimit \
elements/avimux \ elements/avimux \
elements/avisubtitle \ elements/avisubtitle \
elements/capssetter \
elements/deinterlace \ elements/deinterlace \
elements/deinterleave \ elements/deinterleave \
elements/equalizer \ elements/equalizer \
......
...@@ -16,6 +16,7 @@ audiopanorama ...@@ -16,6 +16,7 @@ audiopanorama
autodetect autodetect
avimux avimux
avisubtitle avisubtitle
capssetter
cmmldec cmmldec
cmmlenc cmmlenc
deinterlace deinterlace
......
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