alpha: Add documentation

diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 97c14f0a5da7bc6cec2e3c5ed2c841038b7a8ac3..a0ad5c3da70e7242c849c2d52205a9edd8c03c26 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -20,6 +20,7 @@
     <title>gst-plugins-good Elements</title>
     <xi:include href="xml/element-aasink.xml" />
     <xi:include href="xml/element-agingtv.xml" />
+    <xi:include href="xml/element-alpha.xml" />
     <xi:include href="xml/element-alphacolor.xml" />
     <xi:include href="xml/element-alawdec.xml" />
     <xi:include href="xml/element-alawenc.xml" />

diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index c35ceb84597bf89ebbda8b43cedce7a5da32011b..259ab1a5e4ece294e803f4d644354499181a7abe 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -39,6 +39,21 @@ GST_IS_ALAW_ENC_CLASS
 gst_alaw_enc_get_type
 </SECTION>
 
+<SECTION>
+<FILE>element-alpha</FILE>
+<TITLE>alpha</TITLE>
+GstAlpha
+GstAlphaMethod
+<SUBSECTION Standard>
+GstAlphaClass
+GST_ALPHA
+GST_IS_ALPHA
+GST_TYPE_ALPHA
+gst_alpha_get_type
+GST_ALPHA_CLASS
+GST_IS_ALPHA_CLASS
+</SECTION>
+
 <SECTION>
 <FILE>element-alphacolor</FILE>
 <TITLE>alphacolor</TITLE>

diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c
index a88a938a8e5c8439c6dc6726f48178a8207288d8..fd189d3eeec945b85a0100b2bc99a51627d09299 100644 (file)
--- a/gst/alpha/gstalpha.c
+++ b/gst/alpha/gstalpha.c
@@ -20,6 +20,25 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/**
+ * SECTION:element-alpha
+ * 
+ * The alpha element adds an alpha channel to a video stream. The values
+ * of the alpha channel can be either be set to a constant or can be
+ * dynamically calculated via chroma keying, e.g. blue can be set as
+ * the transparent color.
+ *
+ * Sample pipeline:
+ * |[
+ * gst-launch videotestsrc pattern=smpte75 ! alpha method=green ! \
+ *   videomixer name=mixer ! ffmpegcolorspace ! autovideosink     \
+ *   videotestsrc pattern=snow ! mixer.
+ * ]| This pipeline adds a alpha channel to the SMPTE color bars
+ * with green as the transparent color and mixes the output with
+ * a snow video stream.
+ */
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/gst/alpha/gstalpha.h b/gst/alpha/gstalpha.h
index bc13763c7b3b7d67d580ed5b98f1163feabd7d72..6e4dedf7c0694602292d5c4c90daaf72b827a083 100644 (file)
--- a/gst/alpha/gstalpha.h
+++ b/gst/alpha/gstalpha.h
@@ -44,6 +44,12 @@ G_BEGIN_DECLS
 typedef struct _GstAlpha GstAlpha;
 typedef struct _GstAlphaClass GstAlphaClass;
 
+/** GstAlphaMethod:
+ * @ALPHA_METHOD_SET: Set/adjust alpha channel
+ * @ALPHA_METHOD_GREEN: Chroma Key green
+ * @ALPHA_METHOD_BLUE: Chroma Key blue
+ * @ALPHA_METHOD_CUSTOM: Chroma Key on target_r/g/b
+ */
 typedef enum
 {
   ALPHA_METHOD_SET,