Changeset 1945 for pjproject/trunk/pjmedia/src/pjmedia/rtcp_xr.c

Timestamp:

May 2, 2008 3:01:10 PM (16 years ago)

Author:

nanang

Message:

More ticket #513:

• Added RTCP XR features on stream: configurable RTCP XR sending interval, third-party destination for RTCP XR, and sending last RTCP XR packet when stream destroyed.
• Updated end system delay of RTCP XR: sound device latency estimated based on sound device implementation.

File:

• pjproject/trunk/pjmedia/src/pjmedia/rtcp_xr.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/rtcp_xr.c

@@ -270 +270 @@
         pj_uint32_t c33;
         pj_uint32_t ctotal, p32, p23, m;
+        unsigned est_extra_delay;
 
         r = (pjmedia_rtcp_xr_rb_voip_mtc*) &sess->pkt.buf[size];
@@ -342 +343 @@
                                     (sess->rtcp_session->stat.rtt.last / 1000);
         
-        /* End system delay estimation = RTT/2 + current jitter buffer size +
-         *                               EXTRA
+        /* End system delay = RTT/2 + current jitter buffer size + 
+         *                    EXTRA (estimated extra delay)
          * EXTRA will cover additional delay introduced by other components of
          * audio engine, e.g: sound device, codec, AEC, PLC, WSOLA.
          * Since it is difficult to get the exact value of EXTRA, estimation
-         * is taken to be totally around 50 ms.
+         * is taken to be totally around 30ms + sound device latency.
          */
+        est_extra_delay = 30 + 
+#if PJMEDIA_SOUND_IMPLEMENTATION==PJMEDIA_SOUND_PORTAUDIO_SOUND
+                          PJMEDIA_PASOUND_MAX_LATENCY
+#elif PJMEDIA_SOUND_IMPLEMENTATION==PJMEDIA_SOUND_NULL_SOUND
+                          0
+#else
+                          (PJMEDIA_SOUND_BUFFER_COUNT * 15)
+#endif
+                          ;
         sess->stat.rx.voip_mtc.end_sys_delay = (pj_uint16_t)
-                                (sess->stat.rx.voip_mtc.rnd_trip_delay / 2 +
-                                 sess->stat.rx.voip_mtc.jb_nom + 50);
+                                 (sess->stat.rx.voip_mtc.rnd_trip_delay / 2 +
+                                 sess->stat.rx.voip_mtc.jb_nom + 
+                                 est_extra_delay);
 
         /* Generate block contents */