From e101037589eae4e45ee9084d7f48c2685b804ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 1 May 2009 01:59:56 +0100 Subject: fpsdisplaysink: rename plugin (not element) to debugutilsbad Makes it easier to add further utils here without creating yet another plugin. --- docs/plugins/inspect/plugin-debugutilsbad.xml | 28 ++++++++++++++++++ docs/plugins/inspect/plugin-fpsdisplaysink.xml | 28 ------------------ gst/debugutils/Makefile.am | 12 ++++---- gst/debugutils/debugutilsbad.c | 39 ++++++++++++++++++++++++++ gst/debugutils/fpsdisplaysink.c | 19 ++----------- 5 files changed, 76 insertions(+), 50 deletions(-) create mode 100644 docs/plugins/inspect/plugin-debugutilsbad.xml delete mode 100644 docs/plugins/inspect/plugin-fpsdisplaysink.xml create mode 100644 gst/debugutils/debugutilsbad.c diff --git a/docs/plugins/inspect/plugin-debugutilsbad.xml b/docs/plugins/inspect/plugin-debugutilsbad.xml new file mode 100644 index 00000000..9edeaf09 --- /dev/null +++ b/docs/plugins/inspect/plugin-debugutilsbad.xml @@ -0,0 +1,28 @@ + + debugutilsbad + Collection of elements that may or may not be useful for debugging + ../../gst/debugutils/.libs/libgstdebugutilsbad.so + libgstdebugutilsbad.so + 0.10.11.1 + LGPL + gst-plugins-bad + GStreamer Bad Plug-ins CVS/prerelease + Unknown package origin + + + fpsdisplaysink + Measure and show framerate on videosink + Sink/Video + Shows the current frame-rate and drop-rate of the videosink as overlay or text on stdout + Zeeshan Ali <zeeshan.ali@nokia.com>, Stefan Kost <stefan.kost@nokia.com> + + + sink + sink + always +
ANY
+ + + + + \ No newline at end of file diff --git a/docs/plugins/inspect/plugin-fpsdisplaysink.xml b/docs/plugins/inspect/plugin-fpsdisplaysink.xml deleted file mode 100644 index ef1d33e9..00000000 --- a/docs/plugins/inspect/plugin-fpsdisplaysink.xml +++ /dev/null @@ -1,28 +0,0 @@ - - fpsdisplaysink - A custom sink that show the current FPS of the sink on the video screen - ../../gst/debugutils/.libs/libgstfpsdisplaysink.so - libgstfpsdisplaysink.so - 0.10.11.1 - LGPL - gst-plugins-bad - Nokia Real-time Communications - - - - fpsdisplaysink - Wrapper for xvimagesink's frame-rate display - Sink/Video - Shows the current frame-rate and drop-rate of the xvimagesink on the xvimagesink's video output - Zeeshan Ali <zeeshan.ali@nokia.com>, Stefan Kost <stefan.kost@nokia.com> - - - sink - sink - always -
ANY
- - - - - \ No newline at end of file diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am index 0d2a989b..d1e1430e 100644 --- a/gst/debugutils/Makefile.am +++ b/gst/debugutils/Makefile.am @@ -1,10 +1,10 @@ -plugin_LTLIBRARIES = libgstfpsdisplaysink.la +plugin_LTLIBRARIES = libgstdebugutilsbad.la -libgstfpsdisplaysink_la_SOURCES = fpsdisplaysink.c -libgstfpsdisplaysink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -libgstfpsdisplaysink_la_LIBADD = $(GST_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) -libgstfpsdisplaysink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstfpsdisplaysink_la_LIBTOOLFLAGS = --tag=disable-static +libgstdebugutilsbad_la_SOURCES = fpsdisplaysink.c debugutilsbad.c +libgstdebugutilsbad_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) +libgstdebugutilsbad_la_LIBADD = $(GST_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) +libgstdebugutilsbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstdebugutilsbad_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = fpsdisplaysink.h diff --git a/gst/debugutils/debugutilsbad.c b/gst/debugutils/debugutilsbad.c new file mode 100644 index 00000000..b1fb6e05 --- /dev/null +++ b/gst/debugutils/debugutilsbad.c @@ -0,0 +1,39 @@ +/* GStreamer + * Copyright (C) 2009 Tim-Philipp Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +GType fps_display_sink_get_type (void); + +static gboolean +plugin_init (GstPlugin * plugin) +{ + return gst_element_register (plugin, "fpsdisplaysink", GST_RANK_NONE, + fps_display_sink_get_type ()); +} + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "debugutilsbad", + "Collection of elements that may or may not be useful for debugging", + plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/debugutils/fpsdisplaysink.c b/gst/debugutils/fpsdisplaysink.c index d22dfad3..4873e98b 100644 --- a/gst/debugutils/fpsdisplaysink.c +++ b/gst/debugutils/fpsdisplaysink.c @@ -452,23 +452,10 @@ fps_display_sink_get_type (void) fps_display_sink_type = g_type_register_static (GST_TYPE_BIN, "FPSDisplaySink", &fps_display_sink_info, 0); + + GST_DEBUG_CATEGORY_INIT (fps_display_sink_debug, "fpsdisplaysink", 0, + "FPS Display Sink"); } return fps_display_sink_type; } - -static gboolean -plugin_init (GstPlugin * plugin) -{ - GST_DEBUG_CATEGORY_INIT (fps_display_sink_debug, "fpsdisplaysink", 0, - "FPS Display Sink"); - - return gst_element_register (plugin, "fpsdisplaysink", - GST_RANK_NONE, FPS_TYPE_DISPLAY_SINK); -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "fpsdisplaysink", - "A custom sink that show the current FPS of the sink on the video screen", - plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) -- cgit v1.2.1