the endless saga of g722 bs

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

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index bd203b3190c3032c507b541e4efd081b6de7450d..017336b444a5a0316c3d929d76b0769e6266e343 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1484,6 +1484,7 @@ static void conference_loop_output(conference_member_t * member)
        uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000;
        uint32_t csamples = switch_bytes_per_frame(member->conference->rate, member->conference->interval);
        uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval);
+       uint32_t tsamples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval);
        uint32_t low_count = 0, bytes = samples * 2;
        call_list_t *call_list = NULL, *cp = NULL;
 
@@ -1494,9 +1495,9 @@ static void conference_loop_output(conference_member_t * member)
 
        if (switch_core_timer_init(&timer, member->conference->timer_name, interval,
                                                           //member->conference->interval, 
-                                                          samples, NULL) == SWITCH_STATUS_SUCCESS) {
+                                                          tsamples, NULL) == SWITCH_STATUS_SUCCESS) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u  samples: %u\n",
-                                                 member->conference->timer_name, interval, samples);
+                                                 member->conference->timer_name, interval, tsamples);
        } else {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
                return;

diff --git a/src/mod/codecs/mod_g722/mod_g722.c b/src/mod/codecs/mod_g722/mod_g722.c
index a58755766684eaecdaa620dd694b5c5b35b22ced..86a60b1fe1224ee31004689ed38e2d5acf6f3746 100644 (file)
--- a/src/mod/codecs/mod_g722/mod_g722.c
+++ b/src/mod/codecs/mod_g722/mod_g722.c
@@ -142,10 +142,10 @@ static const switch_codec_implementation_t g722_16k_implementation = {
        /*.ianacode */ 9,
        /*.iananame */ "G722",
        /*.fmtp */ NULL,
-       /*.samples_per_second */ 16000,
+       /*.samples_per_second */ 8000,
        /*.bits_per_second */ 64000,
        /*.microseconds_per_frame */ 20000,
-       /*.samples_per_frame */ 320,
+       /*.samples_per_frame */ 160,
        /*.bytes_per_frame */ 640,
        /*.encoded_bytes_per_frame */ 160,
        /*.number_of_channels */ 1,

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index c04595aeb177b83a2d23494a6a2226d345b4edd2..fa67b6bb06118152d502660a7fc4224cd4649f65 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -41,7 +41,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, char *ip, uint32_t por
 {
        char buf[2048];
        int ptime = 0;
-       int rate = 0;
+       uint32_t rate = 0;
        uint32_t v_port;
 
        if (!force && !ip && !sr && switch_channel_test_flag(tech_pvt->channel, CF_BYPASS_MEDIA)) {
@@ -112,7 +112,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, char *ip, uint32_t por
 
        if (tech_pvt->rm_encoding) {
                rate = tech_pvt->rm_rate;
-               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%ld\n", tech_pvt->pt, tech_pvt->rm_encoding, tech_pvt->rm_rate);
+               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->pt, tech_pvt->rm_encoding, rate);
                if (tech_pvt->fmtp_out) {
                        snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out);
                }
@@ -124,24 +124,18 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, char *ip, uint32_t por
                int i;
                for (i = 0; i < tech_pvt->num_codecs; i++) {
                        const switch_codec_implementation_t *imp = tech_pvt->codecs[i];
-                       uint32_t rfc_3551_sucks = imp->samples_per_second;
 
                        if (imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) {
                                continue;
                        }
 
-                       if (!rate) {
-                               rate = imp->samples_per_second;
-                       }
+                       rate = imp->samples_per_second;
+                       
                        if (ptime && ptime != imp->microseconds_per_frame / 1000) {
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime);
                        }
 
-                       if (rfc_3551_sucks && imp->ianacode == 9) {
-                               rfc_3551_sucks = 8000;
-                       }
-
-                       snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rfc_3551_sucks);
+                       snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate);
                        if (imp->fmtp) {
                                snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp);
                        }
@@ -152,7 +146,7 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, char *ip, uint32_t por
                snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te);
        }
        if (tech_pvt->cng_pt) {
-               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, rate);
+               snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/8000\n", tech_pvt->cng_pt);
                if (!tech_pvt->rm_encoding) {
                        tech_pvt->cng_pt = 0;
                }
@@ -814,8 +808,10 @@ switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force)
                        int ms;
                        tech_pvt->read_frame.rate = tech_pvt->rm_rate;
                        ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000;
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms\n",
-                                                         switch_channel_get_name(tech_pvt->channel), tech_pvt->rm_encoding, tech_pvt->rm_rate, tech_pvt->codec_ms);
+                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms %d samples\n",
+                                                         switch_channel_get_name(tech_pvt->channel), tech_pvt->rm_encoding, tech_pvt->rm_rate, tech_pvt->codec_ms,
+                                                         tech_pvt->read_codec.implementation->samples_per_frame
+                                                         );
                        tech_pvt->read_frame.codec = &tech_pvt->read_codec;
                        
                        switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
@@ -1176,10 +1172,6 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, sdp_session_t *
                                                continue;
                                        }
                                        
-                                       if (map->rm_pt == 9) {
-                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Oh sure! You say 8000, but you mean 16000! This is, of course, stupid!\n");
-                                               codec_rate = 8000;
-                                       }
                                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u]/[%s:%d:%u]\n",
                                                                          rm_encoding, map->rm_pt, (int)map->rm_rate, imp->iananame, imp->ianacode, codec_rate);
                                        if (map->rm_pt < 96) {

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 0023ab64c264f7ca240828afea9374d3a1281bcd..4996dc9010aef02403aae466768e655b89d23202 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1281,11 +1281,15 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t data
                send_msg = (rtp_msg_t *) data;
        } else {
                uint8_t m = 0;
-               if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->samples_per_interval || rtp_session->ts == rtp_session->samples_per_interval) {
+
+               if ((rtp_session->ts > (rtp_session->last_write_ts + (rtp_session->samples_per_interval * 10)))
+                       || rtp_session->ts == rtp_session->samples_per_interval) {
                        m++;
                }
+
                if (rtp_session->cn && payload != rtp_session->cng_pt) {
                        rtp_session->cn = 0;
+                       m++;
                }
 
                send_msg = &rtp_session->send_msg;