mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 23:28:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

splitmux: Drop allocation queries

Browse source 
They can cause us to deadlock, while we're waiting for a new frame and
upstream is waiting for the allocation query to be answered before
sending a frame

https://bugzilla.gnome.org/show_bug.cgi?id=783753
This commit is contained in:
Vivia Nikolaidou 2017-06-13 17:40:19 +03:00 committed by Sebastian Dröge
parent f6283b082e
commit 96cd941788
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/multifile/gstsplitmuxsink.c
View file

@ -1479,6 +1479,13 @@ handle_mq_input (GstPad * pad, GstPadProbeInfo * info, MqStreamCtx * ctx)
break; break;
} }
return GST_PAD_PROBE_PASS; return GST_PAD_PROBE_PASS;
} else if (info->type & GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM) {
switch (GST_QUERY_TYPE (GST_QUERY (info->data))) {
case GST_QUERY_ALLOCATION:
return GST_PAD_PROBE_DROP;
default:
return GST_PAD_PROBE_PASS;
}
} }
buf = gst_pad_probe_info_get_buffer (info); buf = gst_pad_probe_info_get_buffer (info);
@ -1854,7 +1861,8 @@ gst_splitmux_sink_request_new_pad (GstElement * element,
mq_stream_ctx_ref (ctx); mq_stream_ctx_ref (ctx);
ctx->sink_pad_block_id = ctx->sink_pad_block_id =
gst_pad_add_probe (q_sink, gst_pad_add_probe (q_sink,
GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH, GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_FLUSH |
GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM,
(GstPadProbeCallback) handle_mq_input, ctx, (GDestroyNotify) (GstPadProbeCallback) handle_mq_input, ctx, (GDestroyNotify)
_pad_block_destroy_sink_notify); _pad_block_destroy_sink_notify);