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

queue2: make sure update_buffering is called with the lock taken

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6165>
This commit is contained in:
Arnaud Vrac 2024-02-21 11:17:13 +01:00 committed by GStreamer Marge Bot
parent 125c89319a
commit 54aa6b66d8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subprojects/gstreamer/plugins/elements/gstqueue2.c
View File

@ -878,14 +878,15 @@ query_downstream_bitrate (GstQueue2 * queue)
GST_QUEUE2_MUTEX_LOCK (queue); GST_QUEUE2_MUTEX_LOCK (queue);
changed = queue->downstream_bitrate != downstream_bitrate; changed = queue->downstream_bitrate != downstream_bitrate;
queue->downstream_bitrate = downstream_bitrate; if (changed) {
queue->downstream_bitrate = downstream_bitrate;
if (queue->use_buffering)
update_buffering (queue);
}
GST_QUEUE2_MUTEX_UNLOCK (queue); GST_QUEUE2_MUTEX_UNLOCK (queue);
if (changed) { if (changed) {
if (queue->use_buffering)
update_buffering (queue);
gst_queue2_post_buffering (queue); gst_queue2_post_buffering (queue);
g_object_notify_by_pspec (G_OBJECT (queue), obj_props[PROP_BITRATE]); g_object_notify_by_pspec (G_OBJECT (queue), obj_props[PROP_BITRATE]);
} }
} }
@ -3285,15 +3286,15 @@ out_flushing:
queue->last_query = FALSE; queue->last_query = FALSE;
g_cond_signal (&queue->query_handled); g_cond_signal (&queue->query_handled);
} }
GST_QUEUE2_MUTEX_UNLOCK (queue);
GST_CAT_LOG_OBJECT (queue_dataflow, queue,
"pause task, reason: %s", gst_flow_get_name (queue->srcresult));
/* Recalculate buffering levels before stopping since the source flow /* Recalculate buffering levels before stopping since the source flow
* might cause a different buffering level (like NOT_LINKED making * might cause a different buffering level (like NOT_LINKED making
* the queue appear as full) */ * the queue appear as full) */
if (queue->use_buffering) if (queue->use_buffering)
update_buffering (queue); update_buffering (queue);
GST_QUEUE2_MUTEX_UNLOCK (queue);
gst_queue2_post_buffering (queue); gst_queue2_post_buffering (queue);
GST_CAT_LOG_OBJECT (queue_dataflow, queue,
"pause task, reason: %s", gst_flow_get_name (queue->srcresult));
/* let app know about us giving up if upstream is not expected to do so */ /* let app know about us giving up if upstream is not expected to do so */
/* EOS is already taken care of elsewhere */ /* EOS is already taken care of elsewhere */
if (eos && (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS)) { if (eos && (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS)) {