FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

adaptivedemux: Copy collection inside lock

Browse Source 
When posting the collection message, don't access the shared
collection after releasing the manifest and track locks.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9002>
This commit is contained in:
Jan Schmidt 2025-05-17 11:13:33 +02:00 committed by GStreamer Marge Bot
parent 6877ca4d62
commit f6efbbfa2f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
View File

@ -970,7 +970,6 @@ gst_adaptive_demux_update_collection (GstAdaptiveDemux * demux,
static gboolean static gboolean
gst_adaptive_demux_post_collection (GstAdaptiveDemux * demux) gst_adaptive_demux_post_collection (GstAdaptiveDemux * demux)
{ {
GstStreamCollection *collection;
GstAdaptiveDemuxPeriod *period = demux->output_period; GstAdaptiveDemuxPeriod *period = demux->output_period;
guint32 seqnum = g_atomic_int_get (&demux->priv->requested_selection_seqnum); guint32 seqnum = g_atomic_int_get (&demux->priv->requested_selection_seqnum);
@ -980,17 +979,18 @@ gst_adaptive_demux_post_collection (GstAdaptiveDemux * demux)
return TRUE; return TRUE;
} }
collection = period->collection; GstMessage *collection_msg =
gst_message_new_stream_collection (GST_OBJECT (demux),
period->collection);
GST_DEBUG_OBJECT (demux, "Posting collection for period %d", GST_DEBUG_OBJECT (demux, "Posting collection for period %d: %" GST_PTR_FORMAT,
period->period_num); period->period_num, collection_msg);
/* Post collection */ /* Post collection */
TRACKS_UNLOCK (demux); TRACKS_UNLOCK (demux);
GST_MANIFEST_UNLOCK (demux); GST_MANIFEST_UNLOCK (demux);
gst_element_post_message (GST_ELEMENT_CAST (demux), gst_element_post_message (GST_ELEMENT_CAST (demux), collection_msg);
gst_message_new_stream_collection (GST_OBJECT (demux), collection));
GST_MANIFEST_LOCK (demux); GST_MANIFEST_LOCK (demux);
TRACKS_LOCK (demux); TRACKS_LOCK (demux);