Changeset 3366

Timestamp:

04/16/00 01:04:48 (13 years ago)

Author:

ucaccsp

Message:

Fix SR timestamps.

Location:

rat/trunk

Files:

• MODS (modified) (1 diff)
• main_engine.c (modified) (4 diffs)
• transmit.c (modified) (1 diff)
• transmit.h (modified) (2 diffs)

rat/trunk/MODS

@@ -1275 +1275 @@
         - Document configure options which may be needed to build on Irix 
           in INSTALL.TXT
+        - Fix RTP SR timestamps and RTP jitter calculation
+
 
 

rat/trunk/main_engine.c

@@ -119 +119 @@
 int main(int argc, char *argv[])
 {
-        uint32_t         ntp_time = 0;
+        uint32_t         rtp_time = 0;
         int              seed, elapsed_time, alc = 0, scnt = 0;
         session_t       *sp;
@@ -193 +193 @@
                 /* Process audio */
                 elapsed_time = audio_rw_process(sp, sp, sp->ms);
-                ntp_time     = ntp_time32();
 
                 if (tx_is_sending(sp->tb)) {
@@ -204 +203 @@
                 timeout.tv_usec = 0;
                 for (j = 0; j < sp->rtp_session_count; j++) {
-                        while(rtp_recv(sp->rtp_session[j], &timeout, ntp_time));
-                        rtp_send_ctrl(sp->rtp_session[j], ntp_time, NULL);
+                        /* FIXME: The should take an RTP format timestamp! */
+                        rtp_time = tx_get_rtp_time(sp);
+                        while(rtp_recv(sp->rtp_session[j], &timeout, rtp_time));
+                        rtp_send_ctrl(sp->rtp_session[j], rtp_time, NULL);
                         rtp_update(sp->rtp_session[j]);
                 }
@@ -331 +332 @@
                                 timeout.tv_usec = 0;
                                 for (j = 0; j < sp->rtp_session_count; j++) {
-                                        while(rtp_recv(sp->rtp_session[j], &timeout, ntp_time));
+                                        while(rtp_recv(sp->rtp_session[j], &timeout, rtp_time));
                                 }
                                 sp->playing_audio = saved_playing_audio;

rat/trunk/transmit.c

@@ -791 +791 @@
         }
 }
+
+uint32_t
+tx_get_rtp_time(session_t *sp)
+{
+        return ts_seq32_out(&sp->tb->up_seq, sp->tb->sample_rate, sp->cur_ts);
+}
+

rat/trunk/transmit.h

@@ -30 +30 @@
 void  tx_stop        (struct s_tx_buffer  *tb);
 
-int   tx_is_sending    (struct s_tx_buffer  *tb);
+int   tx_is_sending    (struct s_tx_buffer *tb);
 int   tx_read_audio    (struct s_tx_buffer *tb);
 int   tx_process_audio (struct s_tx_buffer *tb);
@@ -39 +39 @@
 double tx_get_bps      (struct s_tx_buffer *tb);
 
+uint32_t tx_get_rtp_time(struct s_session *sp);
+
 #endif /* _transmit_h_ */