Move capsfilter element from -bad to -good

Hook up moved files to the build infrastructure and docs.

Fixes #617739.

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index c6cfbec..f7e5946 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -138,6 +138,7 @@ EXTRA_HFILES = \
        $(top_srcdir)/gst/avi/gstavimux.h \
        $(top_srcdir)/gst/avi/gstavisubtitle.h \
        $(top_srcdir)/gst/cutter/gstcutter.h \
+       $(top_srcdir)/gst/debugutils/gstcapssetter.h \
        $(top_srcdir)/gst/debugutils/gsttaginject.h \
        $(top_srcdir)/gst/debugutils/progressreport.h \
        $(top_srcdir)/gst/deinterlace/gstdeinterlace.h \

diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 3ba0fd5..54157d6 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -51,6 +51,7 @@
     <xi:include href="xml/element-cairotextoverlay.xml" />
     <xi:include href="xml/element-cairotimeoverlay.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-cmmlenc.xml" />
     <xi:include href="xml/element-cutter.xml" />

diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index d95a8e2..85d44aa 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -466,6 +466,20 @@ gst_cairo_render_get_type
 </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>
 <FILE>element-cmmldec</FILE>
 <TITLE>cmmldec</TITLE>
 GstCmmlDec

diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args
index fa3adeb..2d6dfef 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins.args
+++ b/docs/plugins/gst-plugins-good-plugins.args
@@ -20638,3 +20638,32 @@
 <DEFAULT>FALSE</DEFAULT>
 </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>

diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index 26709df..5db0c17 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -96,6 +96,7 @@ GObject
           GstAlphaColor
         GstVideoBox
         GstBreakMyData
+        GstCapsSetter
         GstNavSeek
         GstProgressReport
         GstTagInject

diff --git a/docs/plugins/inspect/plugin-debug.xml b/docs/plugins/inspect/plugin-debug.xml
index 7e54f19..9538ddc 100644 (file)
--- a/docs/plugins/inspect/plugin-debug.xml
+++ b/docs/plugins/inspect/plugin-debug.xml
@@ -31,6 +31,27 @@
       </pads>
     </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>
       <name>navseek</name>
       <longname>Seek based on left-right arrows</longname>
       <class>Filter/Video</class>

diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am
index 8c53cdf..800f0b6 100644 (file)
--- a/gst/debugutils/Makefile.am
+++ b/gst/debugutils/Makefile.am
@@ -8,6 +8,7 @@ plugin_LTLIBRARIES = $(EFENCE_PLUGIN) libgstdebug.la libgstnavigationtest.la
 
 noinst_HEADERS = \
        efence.h \
+       gstcapssetter.h \
        gstnavigationtest.h \
        gstnavseek.h \
        gstpushfilesrc.h \
@@ -32,6 +33,7 @@ libgstnavigationtest_la_LIBTOOLFLAGS = --tag=disable-static
 libgstdebug_la_SOURCES = \
        gstdebug.c \
        breakmydata.c \
+       gstcapssetter.c \
        gstnavseek.c \
        gstpushfilesrc.c \
        gsttaginject.c \

diff --git a/gst/debugutils/gstdebug.c b/gst/debugutils/gstdebug.c
index f2fff1c..da3f180 100644 (file)
--- a/gst/debugutils/gstdebug.c
+++ b/gst/debugutils/gstdebug.c
@@ -24,6 +24,7 @@
 #include <gst/gst.h>
 
 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_navseek_get_type (void);
 GType gst_progress_report_get_type (void);
@@ -39,6 +40,8 @@ plugin_init (GstPlugin * plugin)
 {
   if (!gst_element_register (plugin, "breakmydata", GST_RANK_NONE,
           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_rnd_buffer_size_get_type ())
       || !gst_element_register (plugin, "navseek", GST_RANK_NONE,

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 1446421..ce5d41b 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -107,6 +107,7 @@ check_PROGRAMS = \
        elements/audiowsinclimit \
        elements/avimux \
        elements/avisubtitle \
+       elements/capssetter \
        elements/deinterlace \
        elements/deinterleave \
        elements/equalizer \

diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index a7bb02c..3f17e0e 100644 (file)
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -16,6 +16,7 @@ audiopanorama
 autodetect
 avimux
 avisubtitle
+capssetter
 cmmldec
 cmmlenc
 deinterlace