mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 09:25:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

fpsdisplaysink: Fix resetting of the sink in NULL

Browse source 
Reset the fpsdisplaysink in NULL by removing the textoverlay if we
created it.

Fixes: #582633
This commit is contained in:
Jan Schmidt 2009-05-15 10:45:45 +01:00
parent 48e32a0890
commit 90aa8eff4c
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/debugutils/fpsdisplaysink.c
View file

@ -267,11 +267,11 @@ fps_display_sink_start (GstFPSDisplaySink * self)
gst_object_ref (self->text_overlay);
g_object_set (self->text_overlay,
"font-desc", DEFAULT_FONT, "silent", FALSE, NULL);
}
gst_bin_add (GST_BIN (self), self->text_overlay);
gst_bin_add (GST_BIN (self), self->text_overlay);
if (!gst_element_link (self->text_overlay, self->video_sink)) {
GST_ERROR_OBJECT (self, "Could not link elements");
if (!gst_element_link (self->text_overlay, self->video_sink)) {
GST_ERROR_OBJECT (self, "Could not link elements");
}
}
target_pad = gst_element_get_static_pad (self->text_overlay, "video_sink");
}
@ -280,6 +280,7 @@ no_text_overlay:
if (self->text_overlay) {
gst_element_unlink (self->text_overlay, self->video_sink);
gst_bin_remove (GST_BIN (self), self->text_overlay);
self->text_overlay = NULL;
}
target_pad = gst_element_get_static_pad (self->video_sink, "sink");
}
@ -300,6 +301,13 @@ fps_display_sink_stop (GstFPSDisplaySink * self)
g_source_remove (self->timeout_id);
self->timeout_id = 0;
}
if (self->text_overlay) {
gst_element_unlink (self->text_overlay, self->video_sink);
gst_bin_remove (GST_BIN (self), self->text_overlay);
gst_object_unref (self->text_overlay);
self->text_overlay = NULL;
}
}
static void