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

qtmux: Release object lock before posting an error message

Browse source 
GST_ELEMENT_ERROR() also takes the object lock and this would then
deadlock.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3321>
This commit is contained in:
Sebastian Dröge 2022-11-04 10:49:31 +02:00 committed by GStreamer Marge Bot
parent 73762156f3
commit 7b60e48c8c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-good/gst/isomp4/gstqtmux.c
View file

@ -4046,11 +4046,10 @@ gst_qt_mux_stop_file (GstQTMux * qtmux)
if (qpad->trak->edts
&& g_slist_length (qpad->trak->edts->elst.entries) > 1) {
GST_OBJECT_UNLOCK (qtmux);
GST_ELEMENT_ERROR (qtmux, STREAM, MUX, (NULL),
("Can't support gaps in prefill mode"));
GST_OBJECT_UNLOCK (qtmux);
return GST_FLOW_ERROR;
}
}
@ -5502,6 +5501,7 @@ find_best_pad (GstQTMux * qtmux)
* to be written at */
block_idx = current_block_idx = prefill_get_block_index (qtmux, qtpad);
if (!qtpad->samples || block_idx >= qtpad->samples->len) {
GST_OBJECT_UNLOCK (qtmux);
GST_ELEMENT_ERROR (qtmux, RESOURCE, SETTINGS,
("Failed to create samples in prefill mode"), (NULL));
return NULL;