mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

fpsdisplay: more cleanups

Browse source 
Use normal gst-defines in PLUGIN_DEFINE. Shorten _start/stop method names.
More ideas. Move debug category-init down to plugin-init.
This commit is contained in:
Stefan Kost 2009-04-20 11:38:01 +03:00
parent 314f2e26c5
commit 95520973d0
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/debugutils/fpsdisplaysink.c
View file

@ -34,8 +34,13 @@
/* FIXME: /* FIXME:
* - can we avoid plugging the textoverlay? * - can we avoid plugging the textoverlay?
* - we should use autovideosink as we are RANK_NONE and would not get plugged * - we should use autovideosink as we are RANK_NONE and would not get plugged
* - but then we have to lookup the realsink to be able to set sync
* - gst-seek 15 "videotestsrc ! fpsdisplaysink" dies when closing gst-seek * - gst-seek 15 "videotestsrc ! fpsdisplaysink" dies when closing gst-seek
* - if we make ourself RANK_PRIMARY+10 autovideosink asserts * - if we make ourself RANK_PRIMARY+10 autovideosink asserts
*
* IDEAS:
* - do we want to gather min/max fps and show in GST_STATE_CHANGE_READY_TO_NULL
* - add another property for the FPS_DISPLAY_INTERVAL_MS
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -131,9 +136,6 @@ fps_display_sink_class_init (FPSDisplaySinkClass * klass)
gst_element_class_set_details (gstelement_klass, &fps_display_sink_details); gst_element_class_set_details (gstelement_klass, &fps_display_sink_details);
GST_DEBUG_CATEGORY_INIT (fps_display_sink_debug, "fpsdisplaysink", 0,
"FPS Display Sink");
g_type_class_add_private (klass, sizeof (FPSDisplaySinkPrivate)); g_type_class_add_private (klass, sizeof (FPSDisplaySinkPrivate));
} }
@ -213,9 +215,8 @@ fps_display_sink_init (FPSDisplaySink * self, FPSDisplaySinkClass * g_class)
gst_bin_add_many (GST_BIN (self), gst_bin_add_many (GST_BIN (self),
self->priv->text_overlay, self->priv->video_sink, NULL); self->priv->text_overlay, self->priv->video_sink, NULL);
if (!gst_element_link_many (self->priv->text_overlay, self->priv->video_sink, if (!gst_element_link (self->priv->text_overlay, self->priv->video_sink)) {
NULL)) { GST_ERROR_OBJECT (self, "Could not link elements");
g_error ("Could not link elements");
} }
/* create ghost pad */ /* create ghost pad */
@ -279,7 +280,7 @@ display_current_fps (gpointer data)
} }
static void static void
fps_display_sink_start_the_show (FPSDisplaySink * self) fps_display_sink_start (FPSDisplaySink * self)
{ {
/* Init counters */ /* Init counters */
self->priv->next_ts = GST_CLOCK_TIME_NONE; self->priv->next_ts = GST_CLOCK_TIME_NONE;
@ -294,7 +295,7 @@ fps_display_sink_start_the_show (FPSDisplaySink * self)
} }
static void static void
fps_display_sink_stop_the_show (FPSDisplaySink * self) fps_display_sink_stop (FPSDisplaySink * self)
{ {
/* remove the timeout */ /* remove the timeout */
if (self->priv->timeout_id) { if (self->priv->timeout_id) {
@ -382,7 +383,7 @@ fps_display_sink_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
fps_display_sink_start_the_show (self); fps_display_sink_start (self);
break; break;
default: default:
break; break;
@ -393,7 +394,7 @@ fps_display_sink_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
fps_display_sink_stop_the_show (self); fps_display_sink_stop (self);
break; break;
default: default:
break; break;
@ -430,6 +431,9 @@ fps_display_sink_get_type (void)
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (fps_display_sink_debug, "fpsdisplaysink", 0,
"FPS Display Sink");
return gst_element_register (plugin, "fpsdisplaysink", return gst_element_register (plugin, "fpsdisplaysink",
GST_RANK_NONE, FPS_TYPE_DISPLAY_SINK); GST_RANK_NONE, FPS_TYPE_DISPLAY_SINK);
} }
@ -438,4 +442,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"fpsdisplaysink", "fpsdisplaysink",
"A custom sink that show the current FPS of the sink on the video screen", "A custom sink that show the current FPS of the sink on the video screen",
plugin_init, VERSION, "LGPL", "Nokia Real-time Communications", "") plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)