mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

jitterbuffer: Don't create lost events if we don't need them

Browse source 
When "do-lost" is set to FALSE we don't use/send the lost events.
In that case, don't create them to start with :)

https://bugzilla.gnome.org/show_bug.cgi?id=762988
This commit is contained in:
Edward Hervey 2016-03-02 14:23:01 +01:00 committed by Edward Hervey
parent cf866a8469
commit d656fe8d54
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gst/rtpmanager/gstrtpjitterbuffer.c
View file

@ -3117,7 +3117,7 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum)
case ITEM_TYPE_EVENT: case ITEM_TYPE_EVENT:
/* We got not enough consecutive packets with a huge gap, we can /* We got not enough consecutive packets with a huge gap, we can
* as well just drop them here now on EOS */ * as well just drop them here now on EOS */
if (GST_EVENT_TYPE (outevent) == GST_EVENT_EOS) { if (outevent && GST_EVENT_TYPE (outevent) == GST_EVENT_EOS) {
GST_DEBUG_OBJECT (jitterbuffer, "Clearing gap packets on EOS"); GST_DEBUG_OBJECT (jitterbuffer, "Clearing gap packets on EOS");
g_queue_foreach (&priv->gap_packets, (GFunc) gst_buffer_unref, NULL); g_queue_foreach (&priv->gap_packets, (GFunc) gst_buffer_unref, NULL);
g_queue_clear (&priv->gap_packets); g_queue_clear (&priv->gap_packets);
@ -3128,7 +3128,7 @@ pop_and_push_next (GstRtpJitterBuffer * jitterbuffer, guint seqnum)
if (do_push) if (do_push)
gst_pad_push_event (priv->srcpad, outevent); gst_pad_push_event (priv->srcpad, outevent);
else else if (outevent)
gst_event_unref (outevent); gst_event_unref (outevent);
result = GST_FLOW_OK; result = GST_FLOW_OK;
@ -3374,17 +3374,12 @@ do_lost_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
GstClockTime now) GstClockTime now)
{ {
GstRtpJitterBufferPrivate *priv = jitterbuffer->priv; GstRtpJitterBufferPrivate *priv = jitterbuffer->priv;
GstClockTime duration, timestamp;
guint seqnum, lost_packets, num_rtx_retry, next_in_seqnum; guint seqnum, lost_packets, num_rtx_retry, next_in_seqnum;
gboolean head; gboolean head;
GstEvent *event; GstEvent *event = NULL;
RTPJitterBufferItem *item; RTPJitterBufferItem *item;
seqnum = timer->seqnum; seqnum = timer->seqnum;
timestamp = apply_offset (jitterbuffer, timer->timeout);
duration = timer->duration;
if (duration == GST_CLOCK_TIME_NONE && priv->packet_spacing > 0)
duration = priv->packet_spacing;
lost_packets = MAX (timer->num, 1); lost_packets = MAX (timer->num, 1);
num_rtx_retry = timer->num_rtx_retry; num_rtx_retry = timer->num_rtx_retry;
@ -3404,14 +3399,23 @@ do_lost_timeout (GstRtpJitterBuffer * jitterbuffer, TimerData * timer,
if (gst_rtp_buffer_compare_seqnum (priv->next_in_seqnum, next_in_seqnum) > 0) if (gst_rtp_buffer_compare_seqnum (priv->next_in_seqnum, next_in_seqnum) > 0)
priv->next_in_seqnum = next_in_seqnum; priv->next_in_seqnum = next_in_seqnum;
/* create paket lost event */ /* Avoid creating events if we don't need it. Note that we still need to create
event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, * the lost *ITEM* since it will be used to notify the outgoing thread of
gst_structure_new ("GstRTPPacketLost", * lost items (so that we can set discont flags and such) */
"seqnum", G_TYPE_UINT, (guint) seqnum, if (priv->do_lost) {
"timestamp", G_TYPE_UINT64, timestamp, GstClockTime duration, timestamp;
"duration", G_TYPE_UINT64, duration, /* create paket lost event */
"retry", G_TYPE_UINT, num_rtx_retry, NULL)); timestamp = apply_offset (jitterbuffer, timer->timeout);
duration = timer->duration;
if (duration == GST_CLOCK_TIME_NONE && priv->packet_spacing > 0)
duration = priv->packet_spacing;
event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM,
gst_structure_new ("GstRTPPacketLost",
"seqnum", G_TYPE_UINT, (guint) seqnum,
"timestamp", G_TYPE_UINT64, timestamp,
"duration", G_TYPE_UINT64, duration,
"retry", G_TYPE_UINT, num_rtx_retry, NULL));
}
item = alloc_item (event, ITEM_TYPE_LOST, -1, -1, seqnum, lost_packets, -1); item = alloc_item (event, ITEM_TYPE_LOST, -1, -1, seqnum, lost_packets, -1);
rtp_jitter_buffer_insert (priv->jbuf, item, &head, NULL, -1); rtp_jitter_buffer_insert (priv->jbuf, item, &head, NULL, -1);