mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux2: Clean up stream parsebins on finalize

Browse source 
Remove the parsebin for a stream from the overall
bin when cleaning up the stream, to avoid
keeping around old ones when moving between periods

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2676>
This commit is contained in:
Jan Schmidt 2022-06-29 01:25:41 +10:00 committed by GStreamer Marge Bot
parent 63d3ba4dfb
commit a369448b0c
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
View file

@ -104,6 +104,14 @@ gst_adaptive_demux2_stream_finalize (GObject * object)
if (stream->pad_removed_id) if (stream->pad_removed_id)
g_signal_handler_disconnect (stream->parsebin, stream->pad_removed_id); g_signal_handler_disconnect (stream->parsebin, stream->pad_removed_id);
if (stream->parsebin != NULL) {
GST_LOG_OBJECT (stream, "Removing parsebin");
gst_bin_remove (GST_BIN_CAST (stream->demux), stream->parsebin);
gst_element_set_state (stream->parsebin, GST_STATE_NULL);
gst_object_unref (stream->parsebin);
stream->parsebin = NULL;
}
g_free (stream->fragment_bitrates); g_free (stream->fragment_bitrates);
g_list_free_full (stream->tracks, g_list_free_full (stream->tracks,
@ -1045,7 +1053,7 @@ gst_adaptive_demux2_stream_create_parser (GstAdaptiveDemux2Stream * stream)
if (tsdemux_type) if (tsdemux_type)
g_signal_connect (stream->parsebin, "deep-element-added", g_signal_connect (stream->parsebin, "deep-element-added",
(GCallback) parsebin_deep_element_added_cb, demux); (GCallback) parsebin_deep_element_added_cb, demux);
gst_bin_add (GST_BIN_CAST (demux), stream->parsebin); gst_bin_add (GST_BIN_CAST (demux), gst_object_ref (stream->parsebin));
stream->parsebin_sink = stream->parsebin_sink =
gst_element_get_static_pad (stream->parsebin, "sink"); gst_element_get_static_pad (stream->parsebin, "sink");
stream->pad_added_id = g_signal_connect (stream->parsebin, "pad-added", stream->pad_added_id = g_signal_connect (stream->parsebin, "pad-added",