update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4477 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
index 93e63dc337ff3591b749f1c7daab611a68b3075f..bd997de4691b3184d6ca13f2d133cda5c8b325ca 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c
+++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c
@@ -120,6 +120,7 @@ static struct {
     private_t *call_list;
     int ring_interval;
     GFLAGS flags;
+    switch_timer_t timer;
 } globals;
 
 
@@ -186,6 +187,7 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
        last = switch_time_now() - waitsec;
 
 
+
     if ((val = switch_channel_get_variable(channel, "pa_hold_file"))) {
         hold_file = val;
     } else {
@@ -594,17 +596,6 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
                     goto cng;
                 }
 
-                if (switch_core_timer_init(&tech_pvt->timer,
-                                           globals.timer_name,
-                                           codec_ms,
-                                           globals.read_codec.implementation->samples_per_frame,
-                                           switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
-                    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
-                    switch_core_file_close(&tech_pvt->fh);
-                    switch_core_codec_destroy(&tech_pvt->write_codec);
-                    goto cng;
-                }
-                
                 tech_pvt->hfh = &tech_pvt->fh;
                 tech_pvt->hold_frame.data = tech_pvt->holdbuf;
                 tech_pvt->hold_frame.buflen = sizeof(tech_pvt->holdbuf);
@@ -639,6 +630,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
             
             tech_pvt->hold_frame.datalen = (uint32_t)(olen * sizeof(int16_t));
             tech_pvt->hold_frame.samples = (uint32_t)olen;
+                       tech_pvt->hold_frame.timestamp = tech_pvt->timer.samplecount;
             *frame = &tech_pvt->hold_frame;
             
         }
@@ -651,6 +643,9 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
     if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_frame)) != 0) {
                globals.read_frame.datalen = samples * 2;
                globals.read_frame.samples = samples;
+
+               switch_core_timer_check(&globals.timer);
+               globals.read_frame.timestamp = globals.timer.samplecount;
                *frame = &globals.read_frame;
 
         if (!switch_test_flag((&globals), GFLAG_MOUTH)) {
@@ -1312,6 +1307,21 @@ static switch_status_t engage_device(int sample_rate, int codec_ms)
                 return SWITCH_STATUS_FALSE;
             }
         }
+               
+               if (switch_core_timer_init(&globals.timer,
+                                                                  globals.timer_name,
+                                                                  codec_ms,
+                                                                  globals.read_codec.implementation->samples_per_frame,
+                                                                  module_pool) != SWITCH_STATUS_SUCCESS) {
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n");
+                       switch_core_codec_destroy(&globals.read_codec);
+                       switch_core_codec_destroy(&globals.write_codec);
+                       return SWITCH_STATUS_FALSE;
+               }
+                
+
+
+
 
         globals.read_frame.rate = sample_rate;
         globals.read_frame.codec = &globals.read_codec;

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 00c47d296684ebac8f9c72b6c09eabae3f42fc4c..2cb12349a11cbb722a479ebe58417d846659331a 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1293,6 +1293,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t data
                }
        }
 
+
        rtp_session->last_write_ts = ntohl(send_msg->header.ts);
        rtp_session->last_write_ssrc = ntohl(send_msg->header.ssrc);
        rtp_session->last_write_seq = ntohs((u_short)send_msg->header.seq);
@@ -1384,15 +1385,16 @@ SWITCH_DECLARE(int) switch_rtp_write(switch_rtp_t *rtp_session, void *data, uint
        }
 
        if (!ts && rtp_session->timer.timer_interface) {
-               rtp_session->ts = rtp_session->timer.samplecount;
+               uint32_t sc = rtp_session->timer.samplecount;
+               if (rtp_session->last_write_ts == sc) {
+                       rtp_session->ts = sc + rtp_session->packet_size;
+               } else {
+                       rtp_session->ts = sc;
+               }
        } else {
                rtp_session->ts = ts;
        }
 
-       if (rtp_session->ts <= rtp_session->last_write_ts) {
-               rtp_session->ts += rtp_session->packet_size;
-       }
-
        if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) {
                mark++;
        }
@@ -1449,19 +1451,20 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
                if (frame->timestamp) {
                        rtp_session->ts = (uint32_t) frame->timestamp;
                } else if (!ts && rtp_session->timer.timer_interface) {
-                       rtp_session->ts = rtp_session->timer.samplecount;
+                       uint32_t sc = rtp_session->timer.samplecount;
+                       if (rtp_session->last_write_ts == sc) {
+                               rtp_session->ts = sc + rtp_session->packet_size;
+                       } else {
+                               rtp_session->ts = sc;
+                       }
                } else {
                        rtp_session->ts = ts;
                }
-
+               
                if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) {
                        mark++;
                }
 
-               if (rtp_session->ts <= rtp_session->last_write_ts) {
-                       rtp_session->ts += rtp_session->packet_size;
-               }
-               
                rtp_session->seq = ntohs(rtp_session->seq) + 1;
                rtp_session->seq = htons(rtp_session->seq);
                rtp_session->send_msg.header.seq = rtp_session->seq;