mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

fpsdisplaysink: Internal sink improvements

Browse source 
Does some general improvements with the internal sink handling.
1) Do not remove and re-add the ghostpad when changing
internal sink
2) Only instantiate the default sink when changing from NULL
to READY if there is no other available
3) Avoid changing the internal sink if not on NULL state

Fixes #598682
This commit is contained in:
Thiago Santos 2009-12-17 11:04:28 -03:00
parent a4f30d5f3d
commit 87bfdef683
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gst/debugutils/fpsdisplaysink.c
View file

@ -119,7 +119,8 @@ fps_display_sink_class_init (GstFPSDisplaySinkClass * klass)
g_object_class_install_property (gobject_klass, ARG_VIDEO_SINK, g_object_class_install_property (gobject_klass, ARG_VIDEO_SINK,
g_param_spec_object ("video-sink", g_param_spec_object ("video-sink",
"video-sink", "video-sink",
"Video sink to use", GST_TYPE_ELEMENT, G_PARAM_READWRITE)); "Video sink to use (Must only be called on NULL state)",
GST_TYPE_ELEMENT, G_PARAM_READWRITE));
gstelement_klass->change_state = fps_display_sink_change_state; gstelement_klass->change_state = fps_display_sink_change_state;
@ -216,8 +217,8 @@ update_video_sink (GstFPSDisplaySink * self, GstElement * video_sink)
gst_object_unref (sink_pad); gst_object_unref (sink_pad);
self->data_probe_id = -1; self->data_probe_id = -1;
/* remove ghost pad */ /* remove ghost pad target */
gst_element_remove_pad (GST_ELEMENT (self), self->ghost_pad); gst_ghost_pad_set_target (GST_GHOST_PAD (self->ghost_pad), NULL);
/* remove old sink */ /* remove old sink */
gst_bin_remove (GST_BIN (self), self->video_sink); gst_bin_remove (GST_BIN (self), self->video_sink);
@ -234,10 +235,6 @@ update_video_sink (GstFPSDisplaySink * self, GstElement * video_sink)
gst_bin_add (GST_BIN (self), self->video_sink); gst_bin_add (GST_BIN (self), self->video_sink);
/* create ghost pad */
self->ghost_pad = gst_ghost_pad_new_no_target ("sink", GST_PAD_SINK);
gst_element_add_pad (GST_ELEMENT (self), self->ghost_pad);
/* attach or pad probe */ /* attach or pad probe */
sink_pad = gst_element_get_static_pad (self->video_sink, "sink"); sink_pad = gst_element_get_static_pad (self->video_sink, "sink");
self->data_probe_id = gst_pad_add_data_probe (sink_pad, self->data_probe_id = gst_pad_add_data_probe (sink_pad,
@ -250,19 +247,12 @@ static void
fps_display_sink_init (GstFPSDisplaySink * self, fps_display_sink_init (GstFPSDisplaySink * self,
GstFPSDisplaySinkClass * g_class) GstFPSDisplaySinkClass * g_class)
{ {
GstElement *video_sink;
self->sync = FALSE; self->sync = FALSE;
self->use_text_overlay = TRUE; self->use_text_overlay = TRUE;
self->video_sink = NULL;
video_sink = gst_element_factory_make ("autovideosink", self->ghost_pad = gst_ghost_pad_new_no_target ("sink", GST_PAD_SINK);
"fps-display-video_sink"); gst_element_add_pad (GST_ELEMENT (self), self->ghost_pad);
if (!video_sink) {
GST_ERROR_OBJECT (self, "element could not be created");
return;
}
update_video_sink (self, video_sink);
self->query = gst_query_new_position (GST_FORMAT_TIME); self->query = gst_query_new_position (GST_FORMAT_TIME);
} }
@ -428,6 +418,14 @@ fps_display_sink_set_property (GObject * object, guint prop_id,
} }
break; break;
case ARG_VIDEO_SINK: case ARG_VIDEO_SINK:
/* FIXME should we add a state-lock or a lock around here?
* need to check if it is possible that a state change NULL->READY can
* happen while this code is executing on a different thread */
if (GST_STATE (self) != GST_STATE_NULL) {
g_warning ("Can't set video-sink property of fpsdisplaysink if not on "
"NULL state");
break;
}
update_video_sink (self, (GstElement *) g_value_get_object (value)); update_video_sink (self, (GstElement *) g_value_get_object (value));
break; break;
default: default:
@ -466,7 +464,22 @@ 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 (self);
if (self->video_sink == NULL) {
GstElement *video_sink;
GST_DEBUG_OBJECT (self, "No video sink set, creating autovideosink");
video_sink = gst_element_factory_make ("autovideosink",
"fps-display-video_sink");
update_video_sink (self, video_sink);
}
if (self->video_sink != NULL) {
fps_display_sink_start (self);
} else {
GST_ERROR_OBJECT (self, "Internal sink isn't set and autovideosink "
"could not be created");
ret = GST_STATE_CHANGE_FAILURE;
}
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING: