[FFmpeg-cvslog] r10930 - trunk/libavformat/rtp.c

[lucabe]

Author: lucabe
Date: Mon Nov  5 13:25:10 2007
New Revision: 10930

Log:
Do not send too many RTCP packets (according to the RFC, the minimum
distance between two consecutive RTCP packets is 5s)


Modified:
   trunk/libavformat/rtp.c

Modified: trunk/libavformat/rtp.c
==============================================================================
--- trunk/libavformat/rtp.c	(original)
+++ trunk/libavformat/rtp.c	Mon Nov  5 13:25:10 2007
@@ -802,6 +802,7 @@ static void rtcp_send_sr(AVFormatContext
 #endif
 
     if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) s->first_rtcp_ntp_time = ntp_time;
+    s->last_rtcp_ntp_time = ntp_time;
     rtp_ts = av_rescale_q(ntp_time - s->first_rtcp_ntp_time, AV_TIME_BASE_Q,
                           s1->streams[0]->time_base) + s->base_timestamp;
     put_byte(&s1->pb, (RTP_VERSION << 6));
@@ -984,7 +985,8 @@ static int rtp_write_packet(AVFormatCont
     /* XXX: mpeg pts hardcoded. RTCP send every 0.5 seconds */
     rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) /
         RTCP_TX_RATIO_DEN;
-    if (s->first_packet || rtcp_bytes >= RTCP_SR_SIZE) {
+    if (s->first_packet || ((rtcp_bytes >= RTCP_SR_SIZE) &&
+                           (av_gettime() - s->last_rtcp_ntp_time > 5000000))) {
         rtcp_send_sr(s1, av_gettime());
         s->last_octet_count = s->octet_count;
         s->first_packet = 0;