summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-06-14 15:15:09 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-07-02 00:06:44 -0400
commit7950499805315c637d7347a47f82d97af53a3a5a (patch)
treeb0062aba20cad813765c761c2f7c46fe1c924807
parent68aaa637b83840b547350022474295b52604fb83 (diff)
downloadgstreamer-plugins-bad-7950499805315c637d7347a47f82d97af53a3a5a.tar.gz
videomaxrate: Add to docs
-rw-r--r--docs/plugins/Makefile.am1
-rw-r--r--docs/plugins/gst-plugins-bad-plugins-docs.sgml2
-rw-r--r--docs/plugins/gst-plugins-bad-plugins-sections.txt14
-rw-r--r--gst/videomaxrate/videomaxrate.c14
-rw-r--r--gst/videomaxrate/videomaxrate.h2
5 files changed, 33 insertions, 0 deletions
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 93aa45458..0f9a0651c 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -161,6 +161,7 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/selector/gstoutputselector.h \
$(top_srcdir)/gst/speed/gstspeed.h \
$(top_srcdir)/gst/stereo/gststereo.h \
+ $(top_srcdir)/gst/videomaxrate/videomaxrate.h \
$(top_srcdir)/gst/videosignal/gstvideoanalyse.h \
$(top_srcdir)/gst/videosignal/gstvideodetect.h \
$(top_srcdir)/gst/videosignal/gstvideomark.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index c56545929..342391dae 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -89,6 +89,7 @@
<xi:include href="xml/element-videoanalyse.xml" />
<xi:include href="xml/element-videodetect.xml" />
<xi:include href="xml/element-videomark.xml" />
+ <xi:include href="xml/element-videomaxrate.xml" />
<xi:include href="xml/element-videoparse.xml" />
<xi:include href="xml/element-wildmidi.xml" />
<xi:include href="xml/element-zbar.xml" />
@@ -171,6 +172,7 @@
<xi:include href="xml/plugin-tta.xml" />
<xi:include href="xml/plugin-valve.xml" />
<xi:include href="xml/plugin-vcdsrc.xml" />
+ <xi:include href="xml/plugin-videomaxrate.xml" />
<xi:include href="xml/plugin-videosignal.xml" />
<xi:include href="xml/plugin-vmnc.xml" />
<xi:include href="xml/plugin-wildmidi.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 4302877ba..49535e60c 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -1117,6 +1117,20 @@ GST_IS_VIDEO_DETECT_CLASS
</SECTION>
<SECTION>
+<FILE>element-videomaxrate</FILE>
+<TITLE>videomaxrate</TITLE>
+GstVideoMaxRate
+<SUBSECTION Standard>
+GstVideoMaxRateClass
+GST_VIDEO_MAX_RATE
+GST_IS_VIDEO_MAX_RATE
+GST_TYPE_VIDEO_MAX_RATE
+gst_video_max_rate_get_type
+GST_VIDEO_MAX_RATE_CLASS
+GST_IS_VIDEO_MAX_RATE_CLASS
+</SECTION>
+
+<SECTION>
<FILE>element-videomark</FILE>
<TITLE>videomark</TITLE>
GstVideoMark
diff --git a/gst/videomaxrate/videomaxrate.c b/gst/videomaxrate/videomaxrate.c
index 52edbceec..0d7bb4f07 100644
--- a/gst/videomaxrate/videomaxrate.c
+++ b/gst/videomaxrate/videomaxrate.c
@@ -24,6 +24,20 @@
*
*/
+
+/**
+ * SECTION:element-videomaxrate
+ * @see_also: videorate
+ *
+ * This object will drop buffers that go beyond a certain buffer rate
+ * (ie frame rate). It should work with any kind of data where each buffer
+ * is independent. This currently means raw video frames and still image
+ * formats.
+ *
+ * The framerate is computed using a moving average. The period over which this
+ * average is computed is configurable using the "average-period" property.
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/gst/videomaxrate/videomaxrate.h b/gst/videomaxrate/videomaxrate.h
index 03b17337d..ec8fb8d3a 100644
--- a/gst/videomaxrate/videomaxrate.h
+++ b/gst/videomaxrate/videomaxrate.h
@@ -45,6 +45,8 @@ struct _GstVideoMaxRate
{
GstBaseTransform parent;
+ /*< private >*/
+
GstClockTimeDiff wanted_diff;
GstClockTime average_period;