mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

pipeline: no reason to disconnect a pad that is NULL anyway.

Browse source 
Reviewers: thiblahute

Differential Revision: http://phabricator.freedesktop.org/D62
This commit is contained in:
Mathieu Duponchelle 2015-03-31 15:29:49 +02:00
parent 4a519bcf5c
commit 0d3a3eb9d2
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ges/ges-pipeline.c
View file

@ -855,7 +855,6 @@ static void
_unlink_track (GESPipeline * self, GESTrack * track) _unlink_track (GESPipeline * self, GESTrack * track)
{ {
OutputChain *chain; OutputChain *chain;
GstPad *pad, *peer;
GST_DEBUG_OBJECT (self, "Unlinking removed %" GST_PTR_FORMAT, track); GST_DEBUG_OBJECT (self, "Unlinking removed %" GST_PTR_FORMAT, track);
@ -864,10 +863,9 @@ _unlink_track (GESPipeline * self, GESTrack * track)
return; return;
} }
pad = ges_timeline_get_pad_for_track (self->priv->timeline, track);
/* Unlink encodebin */ /* Unlink encodebin */
if (chain->encodebinpad) { if (chain->encodebinpad) {
peer = gst_pad_get_peer (chain->encodebinpad); GstPad *peer = gst_pad_get_peer (chain->encodebinpad);
gst_pad_unlink (peer, chain->encodebinpad); gst_pad_unlink (peer, chain->encodebinpad);
gst_object_unref (peer); gst_object_unref (peer);
gst_element_release_request_pad (self->priv->encodebin, gst_element_release_request_pad (self->priv->encodebin,
@ -877,16 +875,13 @@ _unlink_track (GESPipeline * self, GESTrack * track)
/* Unlink playsink */ /* Unlink playsink */
if (chain->playsinkpad) { if (chain->playsinkpad) {
peer = gst_pad_get_peer (chain->playsinkpad); GstPad *peer = gst_pad_get_peer (chain->playsinkpad);
gst_pad_unlink (peer, chain->playsinkpad); gst_pad_unlink (peer, chain->playsinkpad);
gst_object_unref (peer); gst_object_unref (peer);
gst_element_release_request_pad (self->priv->playsink, chain->playsinkpad); gst_element_release_request_pad (self->priv->playsink, chain->playsinkpad);
gst_object_unref (chain->playsinkpad); gst_object_unref (chain->playsinkpad);
} }
peer = gst_element_get_static_pad (chain->tee, "sink");
gst_pad_unlink (pad, peer);
gst_object_unref (peer);
gst_element_set_state (chain->tee, GST_STATE_NULL); gst_element_set_state (chain->tee, GST_STATE_NULL);
gst_bin_remove (GST_BIN (self), chain->tee); gst_bin_remove (GST_BIN (self), chain->tee);
if (chain->query_position_id) { if (chain->query_position_id) {
@ -897,7 +892,6 @@ _unlink_track (GESPipeline * self, GESTrack * track)
self->priv->chains = g_list_remove (self->priv->chains, chain); self->priv->chains = g_list_remove (self->priv->chains, chain);
g_free (chain); g_free (chain);
gst_object_unref (pad);
GST_DEBUG ("done"); GST_DEBUG ("done");
} }