projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e3dbf9e)
docs: fix docs build and update after removal of old cairo elements
authorTim-Philipp Müller <tim@centricular.net>
Tue, 1 Jan 2013 12:19:23 +0000 (12:19 +0000)
committerTim-Philipp Müller <tim@centricular.net>
Tue, 1 Jan 2013 12:19:23 +0000 (12:19 +0000)
docs/plugins/Makefile.am patch | blob | history
docs/plugins/gst-plugins-good-plugins-docs.sgml patch | blob | history
docs/plugins/gst-plugins-good-plugins-sections.txt patch | blob | history
docs/plugins/gst-plugins-good-plugins.hierarchy patch | blob | history
docs/plugins/inspect/plugin-cairo.xml patch | blob | history

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 86eb4d4..600a6f5 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -53,9 +53,6 @@ IGNORE_CFILES =
 
 EXTRA_HFILES = \
        $(top_srcdir)/ext/aalib/gstaasink.h \
-       $(top_srcdir)/ext/cairo/gsttextoverlay.h \
-       $(top_srcdir)/ext/cairo/gsttimeoverlay.h \
-       $(top_srcdir)/ext/cairo/gstcairorender.h \
        $(top_srcdir)/ext/cairo/gstcairooverlay.h \
        $(top_srcdir)/ext/dv/gstdvdec.h \
        $(top_srcdir)/ext/dv/gstdvdemux.h \
diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 9467da1..d055cc4 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -52,9 +52,6 @@
     <xi:include href="xml/element-avimux.xml" />
     <xi:include href="xml/element-avisubtitle.xml" />
     <xi:include href="xml/element-cacasink.xml" />
-    <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-cairooverlay.xml" />
     <xi:include href="xml/element-capssetter.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 7081885..656d405 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -472,49 +472,6 @@ gst_cacasink_get_type
 </SECTION>
 
 <SECTION>
-<FILE>element-cairotextoverlay</FILE>
-<TITLE>cairotextoverlay</TITLE>
-GstCairoTextOverlay
-<SUBSECTION Standard>
-GstCairoTextOverlayClass
-GST_TYPE_CAIRO_TEXT_OVERLAY
-GST_CAIRO_TEXT_OVERLAY
-GST_CAIRO_TEXT_OVERLAY_CLASS
-GST_IS_CAIRO_TEXT_OVERLAY
-GST_IS_CAIRO_TEXT_OVERLAY_CLASS
-GST_CAIRO_TEXT_OVERLAY_GET_CLASS
-gst_text_overlay_get_type
-GstCairoTextOverlayHAlign
-GstCairoTextOverlayVAlign
-</SECTION>
-
-<SECTION>
-<FILE>element-cairotimeoverlay</FILE>
-<TITLE>cairotimeoverlay</TITLE>
-GstCairoTimeOverlay
-<SUBSECTION Standard>
-GstCairoTimeOverlayClass
-GST_TYPE_CAIRO_TIME_OVERLAY
-GST_CAIRO_TIME_OVERLAY
-GST_CAIRO_TIME_OVERLAY_CLASS
-GST_IS_CAIRO_TIME_OVERLAY
-GST_IS_CAIRO_TIME_OVERLAY_CLASS
-gst_cairo_time_overlay_get_type
-</SECTION>
-
-<SECTION>
-<FILE>element-cairorender</FILE>
-<TITLE>cairorender</TITLE>
-GstCairoRender
-<SUBSECTION Standard>
-GstCairoRenderClass
-GST_TYPE_CAIRO_RENDER
-GST_CAIRO_RENDER
-GST_CAIRO_RENDER_CLASS
-gst_cairo_render_get_type
-</SECTION>
-
-<SECTION>
 <FILE>element-cairooverlay</FILE>
 <TITLE>cairooverlay</TITLE>
 GstCairoOverlay
diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index faa70c1..51c6241 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -109,6 +109,7 @@ GObject
             GstAgingTV
             GstAlpha
             GstAlphaColor
+            GstCairoOverlay
             GstDiceTV
             GstEdgeTV
             GstGamma
diff --git a/docs/plugins/inspect/plugin-cairo.xml b/docs/plugins/inspect/plugin-cairo.xml
index 1691a11..0b29b3e 100644 (file)
--- a/docs/plugins/inspect/plugin-cairo.xml
+++ b/docs/plugins/inspect/plugin-cairo.xml
@@ -3,7 +3,7 @@
   <description>Cairo-based elements</description>
   <filename>../../ext/cairo/.libs/libgstcairo.so</filename>
   <basename>libgstcairo.so</basename>
-  <version>0.10.30.1</version>
+  <version>1.1.0.1</version>
   <license>LGPL</license>
   <source>gst-plugins-good</source>
   <package>GStreamer Good Plug-ins git</package>
@@ -20,82 +20,13 @@
           <name>sink</name>
           <direction>sink</direction>
           <presence>always</presence>
-          <details>video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
+          <details>video/x-raw, format=(string){ BGRx, BGRA }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
         </caps>
         <caps>
           <name>src</name>
           <direction>source</direction>
           <presence>always</presence>
-          <details>video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>cairorender</name>
-      <longname>Cairo encoder</longname>
-      <class>Codec/Encoder</class>
-      <description>Encodes streams using Cairo</description>
-      <author>Lutz Mueller &lt;lutz@topfrose.de&gt;</author>
-      <pads>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>video/x-raw-rgb, bpp=(int)32, depth=(int)24, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-rgb, bpp=(int)32, depth=(int)32, endianness=(int)4321, red_mask=(int)65280, green_mask=(int)16711680, blue_mask=(int)-16777216, alpha_mask=(int)255, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)Y800, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-gray, bpp=(int)8, depth=(int)8, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; image/png, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]</details>
-        </caps>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>application/pdf, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]; application/postscript, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]; image/svg+xml, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]; image/png, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ]</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>cairotextoverlay</name>
-      <longname>Text overlay</longname>
-      <class>Filter/Editor/Video</class>
-      <description>Adds text strings on top of a video buffer</description>
-      <author>David Schleef &lt;ds@schleef.org&gt;</author>
-      <pads>
-        <caps>
-          <name>text_sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>text/plain</details>
-        </caps>
-        <caps>
-          <name>video_sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
-        </caps>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>cairotimeoverlay</name>
-      <longname>Time overlay</longname>
-      <class>Filter/Editor/Video</class>
-      <description>Overlays the time on a video stream</description>
-      <author>David Schleef &lt;ds@schleef.org&gt;</author>
-      <pads>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
-        </caps>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc)I420, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
+          <details>video/x-raw, format=(string){ BGRx, BGRA }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
         </caps>
       </pads>
     </element>
Domain: Multimedia / Media Common;