mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-07 12:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

encodebin: Set all elements to NULL and remove them from the bin when removing a source group

Browse source
This commit is contained in:
Sebastian Dröge 2011-04-14 12:23:10 +02:00
parent 500d14c35c
commit 67d2f852ff
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/encoding/gstencodebin.c
View file

@ -1559,6 +1559,7 @@ stream_group_free (GstEncodeBin * ebin, StreamGroup * sgroup)
/* Capsfilter - outqueue */ /* Capsfilter - outqueue */
gst_element_set_state (sgroup->outfilter, GST_STATE_NULL); gst_element_set_state (sgroup->outfilter, GST_STATE_NULL);
gst_element_unlink (sgroup->outfilter, sgroup->outqueue); gst_element_unlink (sgroup->outfilter, sgroup->outqueue);
gst_element_set_state (sgroup->outqueue, GST_STATE_NULL);
gst_bin_remove (GST_BIN (ebin), sgroup->outqueue); gst_bin_remove (GST_BIN (ebin), sgroup->outqueue);
/* streamcombiner - parser - capsfilter */ /* streamcombiner - parser - capsfilter */
@ -1566,6 +1567,7 @@ stream_group_free (GstEncodeBin * ebin, StreamGroup * sgroup)
gst_element_set_state (sgroup->parser, GST_STATE_NULL); gst_element_set_state (sgroup->parser, GST_STATE_NULL);
gst_element_unlink (sgroup->parser, sgroup->outfilter); gst_element_unlink (sgroup->parser, sgroup->outfilter);
gst_element_unlink (sgroup->combiner, sgroup->parser); gst_element_unlink (sgroup->combiner, sgroup->parser);
gst_bin_remove ((GstBin *) ebin, sgroup->parser);
} }
/* Sink Ghostpad */ /* Sink Ghostpad */
@ -1606,6 +1608,8 @@ stream_group_free (GstEncodeBin * ebin, StreamGroup * sgroup)
gst_iterator_resync (it); gst_iterator_resync (it);
} }
gst_iterator_free (it); gst_iterator_free (it);
gst_element_set_state (sgroup->combiner, GST_STATE_NULL);
gst_bin_remove ((GstBin *) ebin, sgroup->combiner);
} }
if (sgroup->splitter) { if (sgroup->splitter) {
@ -1616,15 +1620,23 @@ stream_group_free (GstEncodeBin * ebin, StreamGroup * sgroup)
gst_iterator_resync (it); gst_iterator_resync (it);
} }
gst_iterator_free (it); gst_iterator_free (it);
gst_element_set_state (sgroup->splitter, GST_STATE_NULL);
gst_bin_remove ((GstBin *) ebin, sgroup->splitter);
} }
if (sgroup->inqueue) if (sgroup->inqueue)
gst_bin_remove ((GstBin *) ebin, sgroup->inqueue); gst_bin_remove ((GstBin *) ebin, sgroup->inqueue);
if (sgroup->encoder) if (sgroup->encoder)
gst_bin_remove ((GstBin *) ebin, sgroup->encoder); gst_bin_remove ((GstBin *) ebin, sgroup->encoder);
if (sgroup->smartencoder) if (sgroup->smartencoder)
gst_bin_remove ((GstBin *) ebin, sgroup->smartencoder); gst_bin_remove ((GstBin *) ebin, sgroup->smartencoder);
if (sgroup->outfilter)
gst_bin_remove ((GstBin *) ebin, sgroup->outfilter);
g_slice_free (StreamGroup, sgroup); g_slice_free (StreamGroup, sgroup);
} }
@ -1653,6 +1665,7 @@ gst_encode_bin_tear_down_profile (GstEncodeBin * ebin)
/* Remove muxer if present */ /* Remove muxer if present */
if (ebin->muxer) { if (ebin->muxer) {
gst_element_set_state (ebin->muxer, GST_STATE_NULL);
gst_bin_remove (GST_BIN (ebin), ebin->muxer); gst_bin_remove (GST_BIN (ebin), ebin->muxer);
ebin->muxer = NULL; ebin->muxer = NULL;
} }