diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index d87cddd16d..d723b6ac79 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -121,6 +121,7 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/autoconvert/gstautoconvert.h \
$(top_srcdir)/gst/camerabin/gstcamerabin.h \
$(top_srcdir)/gst/deinterlace/gstdeinterlace.h \
+ $(top_srcdir)/gst/deinterlace2/gstdeinterlace2.h \
$(top_srcdir)/gst/dccp/gstdccpclientsink.h \
$(top_srcdir)/gst/dccp/gstdccpclientsrc.h \
$(top_srcdir)/gst/dccp/gstdccpserversink.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index fdf131f12d..f9178b00a0 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -33,6 +33,7 @@
+
@@ -101,6 +102,7 @@
+
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 593bab46ef..0973d7ef01 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -223,6 +223,20 @@ GST_TYPE_DEINTERLACE
gst_deinterlace_get_type
+
+element-deinterlace2
+deinterlace2
+GstDeinterlace2
+
+GstDeinterlace2Class
+GST_IS_DEINTERLACE2
+GST_IS_DEINTERLACE2_CLASS
+GST_DEINTERLACE2
+GST_DEINTERLACE2_CLASS
+GST_TYPE_DEINTERLACE2
+gst_deinterlace2_get_type
+
+
element-dfbvideosink
dfbvideosink
diff --git a/gst/deinterlace2/gstdeinterlace2.c b/gst/deinterlace2/gstdeinterlace2.c
index 0440c61a5b..b293b43e40 100644
--- a/gst/deinterlace2/gstdeinterlace2.c
+++ b/gst/deinterlace2/gstdeinterlace2.c
@@ -19,6 +19,20 @@
* Boston, MA 02111-1307, USA.
*/
+/**
+ * SECTION:element-deinterlace2
+ *
+ * deinterlace2 deinterlaces interlaced video frames to progressive video frames.
+ * For this different algorithms can be selected which will be described later.
+ *
+ *
+ * Example launch line
+ * |[
+ * gst-launch -v filesrc location=/path/to/file ! decodebin2 ! ffmpegcolorspace ! deinterlace2 ! ffmpegcolorspace ! autovideosink
+ * ]| This pipeline deinterlaces a video file with the default deinterlacing options.
+ *
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -482,6 +496,14 @@ gst_deinterlace2_class_init (GstDeinterlace2Class * klass)
gobject_class->get_property = gst_deinterlace2_get_property;
gobject_class->finalize = gst_deinterlace2_finalize;
+ /**
+ * GstDeinterlace2:mode
+ *
+ * This selects whether the deinterlacing methods should
+ * always be applied or if they should only be applied
+ * on content that has the "interlaced" flag on the caps.
+ *
+ */
g_object_class_install_property (gobject_class, PROP_MODE,
g_param_spec_enum ("mode",
"Mode",
@@ -490,6 +512,79 @@ gst_deinterlace2_class_init (GstDeinterlace2Class * klass)
DEFAULT_MODE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
);
+ /**
+ * GstDeinterlace2:method
+ *
+ * Selects the different deinterlacing algorithms that can be used.
+ * These provide different quality and CPU usage.
+ *
+ * Some methods provide parameters which can be set by getting
+ * the "method" child via the #GstChildProxy interface and
+ * setting the appropiate properties on it.
+ *
+ *
+ *
+ *
+ * tomsmocomp
+ * Motion Adaptive: Motion Search
+ *
+ *
+ *
+ *
+ * greedyh
+ * Motion Adaptive: Advanced Detection
+ *
+ *
+ *
+ *
+ * greedyl
+ * Motion Adaptive: Simple Detection
+ *
+ *
+ *
+ *
+ * vfir
+ * Blur vertical
+ *
+ *
+ *
+ *
+ * linear
+ * Linear interpolation
+ *
+ *
+ *
+ *
+ * linearblend
+ * Linear interpolation in time domain
+ *
+ *
+ *
+ *
+ * scalerbob
+ * Double lines
+ *
+ *
+ *
+ *
+ * weave
+ * Weave
+ *
+ *
+ *
+ *
+ * weavetff
+ * Progressive: Top Field First
+ *
+ *
+ *
+ *
+ * weavebff
+ * Progressive: Bottom Field First
+ *
+ *
+ *
+ */
g_object_class_install_property (gobject_class, PROP_METHOD,
g_param_spec_enum ("method",
"Method",
@@ -498,6 +593,13 @@ gst_deinterlace2_class_init (GstDeinterlace2Class * klass)
DEFAULT_METHOD, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
);
+ /**
+ * GstDeinterlace2:fields
+ *
+ * This selects which fields should be output. If "all" is selected
+ * the output framerate will be double.
+ *
+ */
g_object_class_install_property (gobject_class, PROP_FIELDS,
g_param_spec_enum ("fields",
"fields",
@@ -506,6 +608,12 @@ gst_deinterlace2_class_init (GstDeinterlace2Class * klass)
DEFAULT_FIELDS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)
);
+ /**
+ * GstDeinterlace2:layout
+ *
+ * This selects which fields is the first in time.
+ *
+ */
g_object_class_install_property (gobject_class, PROP_FIELD_LAYOUT,
g_param_spec_enum ("tff",
"tff",
diff --git a/gst/deinterlace2/gstdeinterlace2.h b/gst/deinterlace2/gstdeinterlace2.h
index 1d2c3e1a29..de63f54eb4 100644
--- a/gst/deinterlace2/gstdeinterlace2.h
+++ b/gst/deinterlace2/gstdeinterlace2.h
@@ -198,6 +198,8 @@ struct _GstDeinterlace2
GstPad *srcpad, *sinkpad;
+ /* */
+
GstDeinterlace2Mode mode;
GstDeinterlace2FieldLayout field_layout;