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

videotransition: Do not wait pad to be blocked before switching transitions

Browse source 
... from smpte to crossfad and the other way around


This avoid useless async operations
This commit is contained in:
Thibault Saunier 2012-05-21 13:05:14 -04:00
parent 861a06e7ce
commit d8488cf061
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ges/ges-track-video-transition.c
View file

@ -459,9 +459,9 @@ replace_mixer (GESTrackVideoTransitionPrivate * priv)
mixer_src_pad = gst_element_get_static_pad (priv->mixer, "src"); mixer_src_pad = gst_element_get_static_pad (priv->mixer, "src");
color_sink_pad = gst_pad_get_peer (mixer_src_pad); color_sink_pad = gst_pad_get_peer (mixer_src_pad);
gst_element_set_state (priv->mixer, GST_STATE_NULL);
gst_bin_remove (GST_BIN (priv->topbin), priv->mixer); gst_bin_remove (GST_BIN (priv->topbin), priv->mixer);
gst_element_set_state (priv->mixer, GST_STATE_NULL);
gst_object_unref (priv->mixer); gst_object_unref (priv->mixer);
priv->mixer = gst_object_ref (create_mixer (priv->topbin)); priv->mixer = gst_object_ref (create_mixer (priv->topbin));
@ -479,8 +479,7 @@ replace_mixer (GESTrackVideoTransitionPrivate * priv)
} }
static void static void
switch_to_smpte_cb (GstPad * sink, gboolean blocked, switch_to_smpte (GESTrackVideoTransition * transition)
GESTrackVideoTransition * transition)
{ {
GstElement *smptealpha = gst_element_factory_make ("smptealpha", NULL); GstElement *smptealpha = gst_element_factory_make ("smptealpha", NULL);
GstElement *smptealphab = gst_element_factory_make ("smptealpha", NULL); GstElement *smptealphab = gst_element_factory_make ("smptealpha", NULL);
@ -551,8 +550,8 @@ remove_smpte_from_bin (GESTrackVideoTransitionPrivate * priv, GstPad * sink)
gst_pad_unlink (peer_src, smpte_sink); gst_pad_unlink (peer_src, smpte_sink);
gst_pad_unlink (smpte_src, sink); gst_pad_unlink (smpte_src, sink);
gst_element_set_state (smpte, GST_STATE_NULL);
gst_bin_remove (GST_BIN (priv->topbin), smpte); gst_bin_remove (GST_BIN (priv->topbin), smpte);
gst_element_set_state (smpte, GST_STATE_NULL);
gst_object_unref (smpte); gst_object_unref (smpte);
gst_object_unref (smpte_sink); gst_object_unref (smpte_sink);
@ -562,8 +561,7 @@ remove_smpte_from_bin (GESTrackVideoTransitionPrivate * priv, GstPad * sink)
} }
static void static void
switch_to_crossfade_cb (GstPad * sink, gboolean blocked, switch_to_crossfade (GESTrackVideoTransition * transition)
GESTrackVideoTransition * transition)
{ {
GstElement *peera; GstElement *peera;
GstElement *peerb; GstElement *peerb;
@ -708,7 +706,7 @@ ges_track_video_transition_set_transition_type_internal (GESTrackVideoTransition
{ {
GESTrackVideoTransitionPrivate *priv = self->priv; GESTrackVideoTransitionPrivate *priv = self->priv;
GST_LOG ("%p %d => %d", self, priv->type, type); GST_LOG_OBJECT (self, "Changing from type %d to %d", priv->type, type);
if (type == priv->type && !priv->pending_type) { if (type == priv->type && !priv->pending_type) {
GST_INFO ("This type is already set on this transition\n"); GST_INFO ("This type is already set on this transition\n");
@ -727,16 +725,20 @@ ges_track_video_transition_set_transition_type_internal (GESTrackVideoTransition
if (!priv->topbin) if (!priv->topbin)
return FALSE; return FALSE;
priv->smpte = NULL; priv->smpte = NULL;
gst_pad_set_blocked_async (gst_element_get_static_pad (priv->topbin,
"sinka"), TRUE, (GstPadBlockCallback) switch_to_smpte_cb, self); gst_pad_set_blocked_async (priv->sinka, TRUE,
(GstPadBlockCallback) block_pad_cb, NULL);
switch_to_smpte (self);
} else { } else {
if (!priv->topbin) if (!priv->topbin)
return FALSE; return FALSE;
priv->start_value = 1.0; priv->start_value = 1.0;
priv->end_value = 0.0; priv->end_value = 0.0;
gst_pad_set_blocked_async (gst_element_get_static_pad (priv->topbin,
"sinka"), TRUE, (GstPadBlockCallback) switch_to_crossfade_cb, gst_pad_set_blocked_async (priv->sinka, TRUE,
self); (GstPadBlockCallback) block_pad_cb, NULL);
switch_to_crossfade (self);
} }
return TRUE; return TRUE;
} }