mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsource: properly prune RTCP packets out of feedback_retention_window

Browse source 
Closes #522
This commit is contained in:
Miguel Paris 2018-11-29 13:02:53 +01:00 committed by Sebastian Dröge
parent 53f03d4cc1
commit 458741e4b2
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/rtpmanager/rtpsession.c
View file

@ -3644,8 +3644,8 @@ session_cleanup (const gchar * key, RTPSource * source, ReportData * data)
/* check for outdated collisions */ /* check for outdated collisions */
if (source->internal) { if (source->internal) {
GST_DEBUG ("Timing out collisions for %x", source->ssrc); GST_DEBUG ("Timing out collisions for %x", source->ssrc);
rtp_source_timeout (source, data->current_time, rtp_source_timeout (source, data->current_time, data->running_time,
data->running_time - sess->rtcp_feedback_retention_window); sess->rtcp_feedback_retention_window);
} }
/* nothing else to do when without RTCP */ /* nothing else to do when without RTCP */

27
gst/rtpmanager/rtpsource.c
View file

@ -1831,17 +1831,33 @@ rtp_source_add_conflicting_address (RTPSource * src,
*/ */
void void
rtp_source_timeout (RTPSource * src, GstClockTime current_time, rtp_source_timeout (RTPSource * src, GstClockTime current_time,
GstClockTime feedback_retention_window) GstClockTime running_time, GstClockTime feedback_retention_window)
{ {
GstRTCPPacket *pkt; GstRTCPPacket *pkt;
GstClockTime max_pts_window;
guint pruned = 0;
src->conflicting_addresses = src->conflicting_addresses =
timeout_conflicting_addresses (src->conflicting_addresses, current_time); timeout_conflicting_addresses (src->conflicting_addresses, current_time);
if (feedback_retention_window == GST_CLOCK_TIME_NONE ||
running_time < feedback_retention_window) {
return;
}
max_pts_window = running_time - feedback_retention_window;
/* Time out AVPF packets that are older than the desired length */ /* Time out AVPF packets that are older than the desired length */
while ((pkt = g_queue_peek_tail (src->retained_feedback)) && while ((pkt = g_queue_peek_head (src->retained_feedback)) &&
GST_BUFFER_PTS (pkt) < feedback_retention_window) GST_BUFFER_PTS (pkt) < max_pts_window) {
gst_buffer_unref (g_queue_pop_tail (src->retained_feedback)); gst_buffer_unref (g_queue_pop_head (src->retained_feedback));
pruned++;
}
GST_LOG_OBJECT (src,
"%u RTCP packets pruned with PTS less than %" GST_TIME_FORMAT
", queue len: %u", pruned, GST_TIME_ARGS (max_pts_window),
g_queue_get_length (src->retained_feedback));
} }
static gint static gint
@ -1876,6 +1892,9 @@ rtp_source_retain_rtcp_packet (RTPSource * src, GstRTCPPacket * packet,
GST_BUFFER_PTS (buffer) = running_time; GST_BUFFER_PTS (buffer) = running_time;
g_queue_insert_sorted (src->retained_feedback, buffer, compare_buffers, NULL); g_queue_insert_sorted (src->retained_feedback, buffer, compare_buffers, NULL);
GST_LOG_OBJECT (src, "RTCP packet retained with PTS: %" GST_TIME_FORMAT,
GST_TIME_ARGS (running_time));
} }
gboolean gboolean

1
gst/rtpmanager/rtpsource.h
View file

@ -288,6 +288,7 @@ void rtp_conflicting_address_free (RTPConflictingAddress * addr);
void rtp_source_timeout (RTPSource * src, void rtp_source_timeout (RTPSource * src,
GstClockTime current_time, GstClockTime current_time,
GstClockTime running_time,
GstClockTime feedback_retention_window); GstClockTime feedback_retention_window);
void rtp_source_retain_rtcp_packet (RTPSource * src, void rtp_source_retain_rtcp_packet (RTPSource * src,