mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtprtxsend: ensure that no rtx buffers are sent after EOS

Browse source 
To do that, enqueue the EOS event to be sent from the srcpad task
thread and flush the queue right afterwards, so that no more rtx
buffers can be sent, even if there are more requests coming in.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=722370
This commit is contained in:
George Kiagiadakis 2014-01-21 13:42:38 +01:00 committed by Wim Taymans
parent 133913a11a
commit 1a300eb509
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/rtpmanager/gstrtprtxsend.c
View file

@ -577,6 +577,10 @@ gst_rtp_rtx_send_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
gst_pad_start_task (rtx->srcpad, gst_pad_start_task (rtx->srcpad,
(GstTaskFunction) gst_rtp_rtx_send_src_loop, rtx, NULL); (GstTaskFunction) gst_rtp_rtx_send_src_loop, rtx, NULL);
return TRUE; return TRUE;
case GST_EVENT_EOS:
GST_INFO_OBJECT (rtx, "Got EOS - enqueueing it");
gst_rtp_rtx_send_push_out (rtx, event);
return TRUE;
case GST_EVENT_CAPS: case GST_EVENT_CAPS:
{ {
GstCaps *caps; GstCaps *caps;
@ -698,11 +702,23 @@ gst_rtp_rtx_send_src_loop (GstRtpRtxSend * rtx)
if (gst_data_queue_pop (rtx->queue, &data)) { if (gst_data_queue_pop (rtx->queue, &data)) {
GST_LOG_OBJECT (rtx, "pushing rtx buffer %p", data->object); GST_LOG_OBJECT (rtx, "pushing rtx buffer %p", data->object);
gst_pad_push (rtx->srcpad, GST_BUFFER (data->object)); if (G_LIKELY (GST_IS_BUFFER (data->object))) {
gst_pad_push (rtx->srcpad, GST_BUFFER (data->object));
GST_OBJECT_LOCK (rtx); GST_OBJECT_LOCK (rtx);
rtx->num_rtx_packets++; rtx->num_rtx_packets++;
GST_OBJECT_UNLOCK (rtx); GST_OBJECT_UNLOCK (rtx);
} else if (GST_IS_EVENT (data->object)) {
gst_pad_push_event (rtx->srcpad, GST_EVENT (data->object));
/* after EOS, we should not send any more buffers,
* even if there are more requests coming in */
if (GST_EVENT_TYPE (data->object) == GST_EVENT_EOS) {
gst_rtp_rtx_send_set_flushing (rtx, TRUE);
}
} else {
g_assert_not_reached ();
}
data->object = NULL; /* we no longer own that object */ data->object = NULL; /* we no longer own that object */
data->destroy (data); data->destroy (data);