diff --git a/Android.mk b/Android.mk
index 73aed2ca2d..3b1c7a56da 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,7 +29,6 @@ GST_PLUGINS_BAD_BUILT_SOURCES := \
gst/siren/Android.mk \
gst/dataurisrc/Android.mk \
gst/rawparse/Android.mk \
- gst/videomaxrate/Android.mk \
gst/tta/Android.mk \
gst/videosignal/Android.mk \
gst/coloreffects/Android.mk \
@@ -127,7 +126,6 @@ endif
-include $(GST_PLUGINS_BAD_TOP)/gst/siren/Android.mk
-include $(GST_PLUGINS_BAD_TOP)/gst/dataurisrc/Android.mk
-include $(GST_PLUGINS_BAD_TOP)/gst/rawparse/Android.mk
--include $(GST_PLUGINS_BAD_TOP)/gst/videomaxrate/Android.mk
-include $(GST_PLUGINS_BAD_TOP)/gst/tta/Android.mk
-include $(GST_PLUGINS_BAD_TOP)/gst/videosignal/Android.mk
-include $(GST_PLUGINS_BAD_TOP)/gst/coloreffects/Android.mk
diff --git a/configure.ac b/configure.ac
index 9c669f69dc..1ee66d772a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -318,7 +318,7 @@ GST_PLUGINS_NONPORTED=" adpcmdec adpcmenc aiff asfmux \
mpegpsmux mve mxf mythtv nsf nuvdemux \
patchdetect pnm rawparse real removesilence rtpvp8 scaletempo \
sdi segmentclip siren speed subenc stereo tta videofilters \
- videomaxrate videomeasure videosignal vmnc \
+ videomeasure videosignal vmnc \
decklink fbdev linsys shm vcd \
apexsink bz2 cdaudio celt cog curl dc1394 dirac directfb resindvd \
gsettings gsm jp2k ladspa modplug mpeg2enc mimic \
@@ -392,7 +392,6 @@ AG_GST_CHECK_PLUGIN(subenc)
AG_GST_CHECK_PLUGIN(stereo)
AG_GST_CHECK_PLUGIN(tta)
AG_GST_CHECK_PLUGIN(videofilters)
-AG_GST_CHECK_PLUGIN(videomaxrate)
AG_GST_CHECK_PLUGIN(videomeasure)
AG_GST_CHECK_PLUGIN(videoparsers)
AG_GST_CHECK_PLUGIN(videosignal)
@@ -2000,7 +1999,6 @@ gst/subenc/Makefile
gst/stereo/Makefile
gst/tta/Makefile
gst/videofilters/Makefile
-gst/videomaxrate/Makefile
gst/videomeasure/Makefile
gst/videoparsers/Makefile
gst/videosignal/Makefile
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 0dfa82412e..ee525e31d6 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -170,7 +170,6 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/sdp/gstsdpdemux.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 abf1ba357a..c9e2671036 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -121,7 +121,6 @@
-
@@ -214,7 +213,6 @@
-
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 4e9ec0b882..b01e198575 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -1568,20 +1568,6 @@ GST_VIDEO_DETECT_CLASS
GST_IS_VIDEO_DETECT_CLASS
-
-element-videomaxrate
-videomaxrate
-GstVideoMaxRate
-
-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
-
-
element-videomark
videomark
diff --git a/docs/plugins/inspect/plugin-videomaxrate.xml b/docs/plugins/inspect/plugin-videomaxrate.xml
deleted file mode 100644
index ca9ccb4ba7..0000000000
--- a/docs/plugins/inspect/plugin-videomaxrate.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
- videomaxrate
- Drop extra frames
- ../../gst/videomaxrate/.libs/libgstvideomaxrate.so
- libgstvideomaxrate.so
- 0.10.22.1
- LGPL
- gst-plugins-bad
- GStreamer Bad Plug-ins git
- Unknown package origin
-
-
- videomaxrate
- Video maximum rate adjuster
- Filter/Effect/Video
- Drops extra frames
- Justin Karneges <justin@affinix.com>
-
-
- sink
- sink
- always
- video/x-raw-yuv; video/x-raw-rgb; video/x-raw-gray; image/jpeg; image/png
-
-
- src
- source
- always
- video/x-raw-yuv; video/x-raw-rgb; video/x-raw-gray; image/jpeg; image/png
-
-
-
-
-
\ No newline at end of file
diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in
index 13c74b946a..6e0c2d17bf 100644
--- a/gst-plugins-bad.spec.in
+++ b/gst-plugins-bad.spec.in
@@ -248,7 +248,6 @@ make ERROR_CFLAGS='' ERROR_CXXFLAGS=''
# %{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so
# %{_libdir}/gstreamer-%{majorminor}/libgsttta.so
# %{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so
-# %{_libdir}/gstreamer-%{majorminor}/libgstvideomaxrate.so
# %{_libdir}/gstreamer-%{majorminor}/libgstvideomeasure.so
# %{_libdir}/gstreamer-%{majorminor}/libgstvmnc.so
%{_libdir}/gstreamer-%{majorminor}/libgstcamerabin2.so
diff --git a/gst/videomaxrate/Makefile.am b/gst/videomaxrate/Makefile.am
deleted file mode 100644
index cf21139c8c..0000000000
--- a/gst/videomaxrate/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-plugin_LTLIBRARIES = libgstvideomaxrate.la
-
-libgstvideomaxrate_la_SOURCES = videomaxrate.c
-
-noinst_HEADERS = videomaxrate.h
-libgstvideomaxrate_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstvideomaxrate_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
- $(GST_LIBS)
-libgstvideomaxrate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideomaxrate_la_LIBTOOLFLAGS = --tag=disable-static
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
- androgenizer \
- -:PROJECT libgstvideomaxrate -:SHARED libgstvideomaxrate \
- -:TAGS eng debug \
- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
- -:SOURCES $(libgstvideomaxrate_la_SOURCES) \
- -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstvideomaxrate_la_CFLAGS) \
- -:LDFLAGS $(libgstvideomaxrate_la_LDFLAGS) \
- $(libgstvideomaxrate_la_LIBADD) \
- -ldl \
- -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
- LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
- > $@
\ No newline at end of file
diff --git a/gst/videomaxrate/videomaxrate.c b/gst/videomaxrate/videomaxrate.c
deleted file mode 100644
index 0d7bb4f07e..0000000000
--- a/gst/videomaxrate/videomaxrate.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * GStreamer - limit video rate
- *
- * Copyright 2008 Barracuda Networks, Inc.
- *
- * Copyright 2009 Nokia Corporation
- * Copyright 2009 Collabora Ltd,
- * @contact: Olivier Crete
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-
-/**
- * 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
-
-#include "videomaxrate.h"
-
-static GstStaticPadTemplate gst_video_max_rate_src_template =
- GST_STATIC_PAD_TEMPLATE ("src",
- GST_PAD_SRC,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb; video/x-raw-gray;"
- "image/jpeg; image/png")
- );
-
-static GstStaticPadTemplate gst_video_max_rate_sink_template =
- GST_STATIC_PAD_TEMPLATE ("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb; video/x-raw-gray;"
- "image/jpeg; image/png")
- );
-
-static void gst_video_max_rate_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec);
-static void gst_video_max_rate_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec);
-
-static gboolean gst_video_max_rate_start (GstBaseTransform * trans);
-static gboolean gst_video_max_rate_sink_event (GstBaseTransform * trans,
- GstEvent * event);
-static GstCaps *gst_video_max_rate_transform_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps);
-static gboolean gst_video_max_rate_set_caps (GstBaseTransform * trans,
- GstCaps * incaps, GstCaps * outcaps);
-static GstFlowReturn gst_video_max_rate_transform_ip (GstBaseTransform * trans,
- GstBuffer * buf);
-static void gst_video_max_rate_fixate_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
-
-GST_BOILERPLATE (GstVideoMaxRate, gst_video_max_rate, GstBaseTransform,
- GST_TYPE_BASE_TRANSFORM);
-
-#define DEFAULT_AVERAGE_PERIOD GST_SECOND
-
-enum
-{
- PROP_0,
- PROP_AVERAGE_PERIOD
-};
-
-static void
-gst_video_max_rate_base_init (gpointer gclass)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
-
- gst_element_class_set_details_simple (element_class,
- "Video maximum rate adjuster",
- "Filter/Effect/Video",
- "Drops extra frames", "Justin Karneges ");
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_video_max_rate_sink_template));
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&gst_video_max_rate_src_template));
-}
-
-static void
-gst_video_max_rate_class_init (GstVideoMaxRateClass * klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GstBaseTransformClass *base_class = GST_BASE_TRANSFORM_CLASS (klass);
-
- gobject_class->set_property = gst_video_max_rate_set_property;
- gobject_class->get_property = gst_video_max_rate_get_property;
-
- base_class->transform_caps =
- GST_DEBUG_FUNCPTR (gst_video_max_rate_transform_caps);
- base_class->set_caps = GST_DEBUG_FUNCPTR (gst_video_max_rate_set_caps);
- base_class->transform_ip =
- GST_DEBUG_FUNCPTR (gst_video_max_rate_transform_ip);
- base_class->event = GST_DEBUG_FUNCPTR (gst_video_max_rate_sink_event);
- base_class->start = GST_DEBUG_FUNCPTR (gst_video_max_rate_start);
- base_class->fixate_caps = GST_DEBUG_FUNCPTR (gst_video_max_rate_fixate_caps);
-
- g_object_class_install_property (gobject_class, PROP_AVERAGE_PERIOD,
- g_param_spec_uint64 ("average-period", "Period over which to average",
- "Period over which to average the framerate (in ns)",
- 1, G_MAXINT64, DEFAULT_AVERAGE_PERIOD,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-static void
-gst_video_max_rate_reset (GstVideoMaxRate * videomaxrate)
-{
- videomaxrate->last_ts = GST_CLOCK_TIME_NONE;
- videomaxrate->average = 0;
-}
-
-static void
-gst_video_max_rate_init (GstVideoMaxRate * videomaxrate,
- GstVideoMaxRateClass * gclass)
-{
- gst_video_max_rate_reset (videomaxrate);
- videomaxrate->wanted_diff = 0;
- videomaxrate->average_period = DEFAULT_AVERAGE_PERIOD;
-
- gst_base_transform_set_gap_aware (GST_BASE_TRANSFORM (videomaxrate), TRUE);
- gst_base_transform_set_in_place (GST_BASE_TRANSFORM (videomaxrate), TRUE);
-}
-
-
-static void
-gst_video_max_rate_set_property (GObject * object, guint prop_id,
- const GValue * value, GParamSpec * pspec)
-{
- GstVideoMaxRate *videomaxrate = GST_VIDEO_MAX_RATE (object);
-
- switch (prop_id) {
- case PROP_AVERAGE_PERIOD:
- videomaxrate->average_period = g_value_get_uint64 (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-
-static void
-gst_video_max_rate_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec)
-{
- GstVideoMaxRate *videomaxrate = GST_VIDEO_MAX_RATE (object);
-
- switch (prop_id) {
- case PROP_AVERAGE_PERIOD:
- g_value_set_uint64 (value, videomaxrate->average_period);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static gboolean
-gst_video_max_rate_start (GstBaseTransform * trans)
-{
- GstVideoMaxRate *videomaxrate = GST_VIDEO_MAX_RATE (trans);
-
- gst_video_max_rate_reset (videomaxrate);
-
- return TRUE;
-}
-
-gboolean
-gst_video_max_rate_sink_event (GstBaseTransform * trans, GstEvent * event)
-{
- GstVideoMaxRate *videomaxrate = GST_VIDEO_MAX_RATE (trans);
-
- switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_NEWSEGMENT:
- case GST_EVENT_FLUSH_STOP:
- gst_video_max_rate_reset (videomaxrate);
- break;
- default:
- break;
- }
-
- return TRUE;
-}
-
-GstCaps *
-gst_video_max_rate_transform_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps)
-{
- GstCaps *ret;
- GstStructure *s;
-
- /* this function is always called with a simple caps */
- g_return_val_if_fail (GST_CAPS_IS_SIMPLE (caps), NULL);
-
- ret = gst_caps_copy (caps);
-
- s = gst_structure_copy (gst_caps_get_structure (caps, 0));
-
- /* set the framerate as a range */
- gst_structure_set (s, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
- G_MAXINT, 1, NULL);
-
- gst_caps_merge_structure (ret, s);
-
- return ret;
-}
-
-static void
-gst_video_max_rate_fixate_caps (GstBaseTransform * trans,
- GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
-{
- GstStructure *s;
- gint nom, denom;
-
- s = gst_caps_get_structure (caps, 0);
- if (G_UNLIKELY (!gst_structure_get_fraction (s, "framerate", &nom, &denom)))
- return;
-
- s = gst_caps_get_structure (othercaps, 0);
- gst_structure_fixate_field_nearest_fraction (s, "framerate", nom, denom);
-}
-
-gboolean
-gst_video_max_rate_set_caps (GstBaseTransform * trans, GstCaps * incaps,
- GstCaps * outcaps)
-{
- GstVideoMaxRate *videomaxrate = GST_VIDEO_MAX_RATE (trans);
- GstStructure *cs;
- gint numerator, denominator;
-
- // keep track of the outbound framerate
- cs = gst_caps_get_structure (outcaps, 0);
- if (!gst_structure_get_fraction (cs, "framerate", &numerator, &denominator))
- return FALSE;
-
- if (numerator)
- videomaxrate->wanted_diff = gst_util_uint64_scale_int (GST_SECOND,
- denominator, numerator);
- else
- videomaxrate->wanted_diff = 0;
-
- gst_video_max_rate_reset (videomaxrate);
-
- return TRUE;
-}
-
-GstFlowReturn
-gst_video_max_rate_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
-{
- GstVideoMaxRate *videomaxrate = GST_VIDEO_MAX_RATE (trans);
- GstClockTime ts = GST_BUFFER_TIMESTAMP (buf);
-
- if (!GST_BUFFER_TIMESTAMP_IS_VALID (buf) || videomaxrate->wanted_diff == 0)
- return GST_FLOW_OK;
-
- /* drop frames if they exceed our output rate */
- if (GST_CLOCK_TIME_IS_VALID (videomaxrate->last_ts)) {
- GstClockTimeDiff diff = ts - videomaxrate->last_ts;
-
- /* Drop buffer if its early compared to the desired frame rate and
- * the current average is higher than the desired average
- */
- if (diff < videomaxrate->wanted_diff &&
- videomaxrate->average < videomaxrate->wanted_diff)
- return GST_BASE_TRANSFORM_FLOW_DROPPED;
-
- /* Update average */
- if (videomaxrate->average) {
- GstClockTimeDiff wanted_diff;
-
- if (G_LIKELY (videomaxrate->average_period > videomaxrate->wanted_diff))
- wanted_diff = videomaxrate->wanted_diff;
- else
- wanted_diff = videomaxrate->average_period * 10;
-
- videomaxrate->average =
- gst_util_uint64_scale_round (videomaxrate->average,
- videomaxrate->average_period - wanted_diff,
- videomaxrate->average_period) +
- gst_util_uint64_scale_round (diff, wanted_diff,
- videomaxrate->average_period);
- } else {
- videomaxrate->average = diff;
- }
- }
-
- videomaxrate->last_ts = ts;
- return GST_FLOW_OK;
-}
-
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
- return gst_element_register (plugin, "videomaxrate", GST_RANK_NONE,
- GST_TYPE_VIDEO_MAX_RATE);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- "videomaxrate",
- "Drop extra frames",
- plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/videomaxrate/videomaxrate.h b/gst/videomaxrate/videomaxrate.h
deleted file mode 100644
index ec8fb8d3a6..0000000000
--- a/gst/videomaxrate/videomaxrate.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2008 Barracuda Networks, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef __GST_VIDEOMAXRATE_H__
-#define __GST_VIDEOMAXRATE_H__
-
-#include
-#include
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_VIDEO_MAX_RATE \
- (gst_video_max_rate_get_type())
-#define GST_VIDEO_MAX_RATE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VIDEO_MAX_RATE,GstVideoMaxRate))
-#define GST_VIDEO_MAX_RATE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VIDEO_MAX_RATE, \
- GstVideoMaxRateClass))
-#define GST_IS_VIDEO_MAX_RATE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEO_MAX_RATE))
-#define GST_IS_VIDEO_MAX_RATE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEO_MAX_RATE))
-
-typedef struct _GstVideoMaxRate GstVideoMaxRate;
-typedef struct _GstVideoMaxRateClass GstVideoMaxRateClass;
-
-struct _GstVideoMaxRate
-{
- GstBaseTransform parent;
-
- /*< private >*/
-
- GstClockTimeDiff wanted_diff;
- GstClockTime average_period;
-
- GstClockTime last_ts;
- GstClockTimeDiff average;
-};
-
-struct _GstVideoMaxRateClass
-{
- GstBaseTransformClass parent_class;
-};
-
-GType gst_video_max_rate_get_type(void);
-
-G_END_DECLS
-
-#endif /* __GST_VIDEOMAXRATE_H__ */