mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 18:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

session: fix average RTCP packet size some more.

Browse source 
Fix stupid error in averaging macro.
Include udp headers in packet length estimation.
This commit is contained in:
Wim Taymans 2010-12-14 18:12:43 +01:00
parent 7ebd374766
commit 0c3333da04
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst/rtpmanager/rtpsession.c
View file

@ -81,7 +81,8 @@ enum
if ((avg) == 0) \ if ((avg) == 0) \
(avg) = (val); \ (avg) = (val); \
else \ else \
(avg) = ((val) + (15 * (val))) >> 4; (avg) = ((val) + (15 * (avg))) >> 4;
/* The number RTCP intervals after which to timeout entries in the /* The number RTCP intervals after which to timeout entries in the
* collision table * collision table
@ -368,6 +369,7 @@ rtp_session_init (RTPSession * sess)
sess->source->validated = TRUE; sess->source->validated = TRUE;
sess->source->internal = TRUE; sess->source->internal = TRUE;
sess->stats.active_sources++; sess->stats.active_sources++;
INIT_AVG (sess->stats.avg_rtcp_packet_size, 100);
/* default UDP header length */ /* default UDP header length */
sess->header_len = 28; sess->header_len = 28;
@ -2001,6 +2003,8 @@ rtp_session_process_rtcp (RTPSession * sess, GstBuffer * buffer,
/* keep track of average packet size */ /* keep track of average packet size */
UPDATE_AVG (sess->stats.avg_rtcp_packet_size, arrival.bytes); UPDATE_AVG (sess->stats.avg_rtcp_packet_size, arrival.bytes);
} }
GST_DEBUG ("%p, received RTCP packet, avg size %u, %u", &sess->stats,
sess->stats.avg_rtcp_packet_size, arrival.bytes);
RTP_SESSION_UNLOCK (sess); RTP_SESSION_UNLOCK (sess);
/* notify caller of sr packets in the callback */ /* notify caller of sr packets in the callback */
@ -2693,10 +2697,13 @@ rtp_session_on_timeout (RTPSession * sess, GstClockTime current_time,
gst_rtcp_buffer_end (data.rtcp); gst_rtcp_buffer_end (data.rtcp);
if (sess->callbacks.send_rtcp) { if (sess->callbacks.send_rtcp) {
UPDATE_AVG (sess->stats.avg_rtcp_packet_size, guint packet_size;
GST_BUFFER_SIZE (data.rtcp));
GST_DEBUG ("sending RTCP packet, avg size %u", packet_size = GST_BUFFER_SIZE (data.rtcp) + sess->header_len;
sess->stats.avg_rtcp_packet_size);
UPDATE_AVG (sess->stats.avg_rtcp_packet_size, packet_size);
GST_DEBUG ("%p, sending RTCP packet, avg size %u, %u", &sess->stats,
sess->stats.avg_rtcp_packet_size, packet_size);
result = result =
sess->callbacks.send_rtcp (sess, own, data.rtcp, sess->sent_bye, sess->callbacks.send_rtcp (sess, own, data.rtcp, sess->sent_bye,
sess->send_rtcp_user_data); sess->send_rtcp_user_data);