audio adjustments

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index fa1f12c13f55b38c4782504825fa46a72f0c01b1..2370e70ba1f2a5b656e9a1b51a20b29f92a9028f 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -408,7 +408,7 @@ static switch_status_t conference_local_play_file(conference_obj_t *conference,
 static switch_status_t conference_member_play_file(conference_member_t *member, char *file, uint32_t leadin);
 static switch_status_t conference_member_say(conference_member_t *member, char *text, uint32_t leadin);
 static uint32_t conference_member_stop_file(conference_member_t *member, file_stop_t stop);
-static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_memory_pool_t *pool);
+static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_core_session_t *session, switch_memory_pool_t *pool);
 static switch_status_t chat_send(const char *proto, const char *from, const char *to, const char *subject,
                                                                 const char *body, const char *type, const char *hint);
 
@@ -2499,6 +2499,10 @@ static void conference_loop_output(conference_member_t *member)
 
                use_buffer = NULL;
                mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer);
+               
+               if (mux_used < bytes * 2) {
+                       use_timer = 1;
+               }
 
                if (mux_used) {
                        if (mux_used < bytes) {
@@ -2512,10 +2516,7 @@ static void conference_loop_output(conference_member_t *member)
                        }
                }
 
-
-               use_timer = 1;
-
-               if (mux_used) {
+               if (mux_used >= bytes) {
                        /* Flush the output buffer and write all the data (presumably muxed) back to the channel */
                        switch_mutex_lock(member->audio_out_mutex);
                        write_frame.data = data;
@@ -2523,7 +2524,7 @@ static void conference_loop_output(conference_member_t *member)
                        low_count = 0;
                        if ((write_frame.datalen = (uint32_t) switch_buffer_read(use_buffer, write_frame.data, bytes))) {
                                if (write_frame.datalen) {
-               write_frame.samples = write_frame.datalen / 2;
+                                       write_frame.samples = write_frame.datalen / 2;
                                   
                                   if( !switch_test_flag(member, MFLAG_CAN_HEAR)) {
                                      memset(write_frame.data, 255, write_frame.datalen);
@@ -4347,7 +4348,7 @@ static switch_status_t conf_api_sub_transfer(conference_obj_t *conference, switc
                                        }
                                        
                                        /* Create the conference object. */
-                                       new_conference = conference_new(conf_name, xml_cfg, pool);
+                                       new_conference = conference_new(conf_name, xml_cfg, member->session, pool);
 
                                        /* Release the config registry handle */
                                        if (cxml) {
@@ -5472,7 +5473,7 @@ SWITCH_STANDARD_APP(conference_function)
                }
 
                /* Create the conference object. */
-               conference = conference_new(conf_name, xml_cfg, NULL);
+               conference = conference_new(conf_name, xml_cfg, session, NULL);
 
                if (!conference) {
                        goto done;
@@ -5517,7 +5518,7 @@ SWITCH_STANDARD_APP(conference_function)
                        const char *max_members_str;
 
                        /* couldn't find the conference, create one */
-                       conference = conference_new(conf_name, xml_cfg, NULL);
+                       conference = conference_new(conf_name, xml_cfg, session, NULL);
 
                        if (!conference) {
                                goto done;
@@ -5942,7 +5943,7 @@ static conference_obj_t *conference_find(char *name)
 }
 
 /* create a new conferene with a specific profile */
-static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_memory_pool_t *pool)
+static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_core_session_t *session, switch_memory_pool_t *pool)
 {
        conference_obj_t *conference;
        switch_xml_t xml_kvp;
@@ -5985,13 +5986,48 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
        char *verbose_events = NULL;
        char *auto_record = NULL;
        char *terminate_on_silence = NULL;
-       
+       switch_codec_implementation_t read_impl = { 0 };
+       switch_channel_t *channel = NULL;
+       const char *force_rate = NULL, *force_interval = NULL;
+       uint32_t force_rate_i = 0, force_interval_i = 0;
+
        /* Validate the conference name */
        if (zstr(name)) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Record! no name.\n");
                return NULL;
        }
 
+       if (session) {
+               uint32_t tmp;
+
+               switch_core_session_get_read_impl(session, &read_impl);
+               channel = switch_core_session_get_channel(session);
+               
+               if ((force_rate = switch_channel_get_variable(channel, "conference_force_rate"))) {
+                       if (!strcasecmp(force_rate, "auto")) {
+                               force_rate_i = read_impl.actual_samples_per_second;
+                       } else {
+                               tmp = atoi(force_rate);
+
+                               if (tmp == 8000 || tmp == 12000 || tmp == 16000 || tmp == 24000 || tmp == 32000 || tmp == 48000) {
+                                       force_rate_i = rate = tmp;
+                               }
+                       }
+               }
+
+               if ((force_interval = switch_channel_get_variable(channel, "conference_force_interval"))) {
+                       if (!strcasecmp(force_interval, "auto")) {
+                               force_interval_i = read_impl.microseconds_per_packet / 1000;
+                       } else {
+                               tmp = atoi(force_interval);
+                               
+                               if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) {
+                                       force_interval_i = interval = tmp;
+                               }
+                       }
+               }
+       }
+
        switch_mutex_lock(globals.hash_mutex);
 
        /* parse the profile tree for param values */
@@ -6012,20 +6048,33 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
                                var = buf;
                        }
 
-                       if (!strcasecmp(var, "rate") && !zstr(val)) {
+                       if (!force_rate_i && !strcasecmp(var, "rate") && !zstr(val)) {
                                uint32_t tmp = atoi(val);
-                               if (tmp == 8000 || tmp == 12000 || tmp == 16000 || tmp == 24000 || tmp == 32000 || tmp == 48000) {
-                                       rate = tmp;
+                               if (session && tmp == 0) {
+                                       if (!strcasecmp(val, "auto")) {
+                                               rate = read_impl.actual_samples_per_second;
+                                       }
+                               } else {
+                                       if (tmp == 8000 || tmp == 12000 || tmp == 16000 || tmp == 24000 || tmp == 32000 || tmp == 48000) {
+                                               rate = tmp;
+                                       }
                                }
                        } else if (!strcasecmp(var, "domain") && !zstr(val)) {
                                domain = val;
-                       } else if (!strcasecmp(var, "interval") && !zstr(val)) {
+                       } else if (!force_interval_i && !strcasecmp(var, "interval") && !zstr(val)) {
                                uint32_t tmp = atoi(val);
-                               if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) {
-                                       interval = tmp;
+
+                               if (session && tmp == 0) {
+                                       if (!strcasecmp(val, "auto")) {
+                                               interval = read_impl.microseconds_per_packet / 1000;
+                                       }
                                } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
-                                                                         "Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
+                                       if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) {
+                                               interval = tmp;
+                                       } else {
+                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+                                                                                 "Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL);
+                                       }
                                }
                        } else if (!strcasecmp(var, "timer-name") && !zstr(val)) {
                                timer_name = val;
@@ -6296,6 +6345,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_m
        } else {
                conference->domain = "cluecon.com";
        }
+
        conference->rate = rate;
        conference->interval = interval;
 

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 60c0bae9736b4193a0982145a625a0d9b583e087..5c4aa307fd8ff0f77eb88f15202c4d86ccc1d44e 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -2172,8 +2172,9 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
        *bytes = sizeof(rtp_msg_t);
        status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, bytes);
        ts = ntohl(rtp_session->recv_msg.header.ts);
-
-       if (ts && !rtp_session->jb && ts <= rtp_session->last_cng_ts) {
+       
+       if (*bytes && (!rtp_session->recv_te || rtp_session->recv_msg.header.pt != rtp_session->recv_te) && 
+               ts && !rtp_session->jb && ts == rtp_session->last_cng_ts) {
                /* we already sent this frame..... */
                *bytes = 0;
                return SWITCH_STATUS_SUCCESS;
@@ -2929,8 +2930,13 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 
                if (do_cng) {
                        uint8_t *data = (uint8_t *) rtp_session->recv_msg.body;
-                       rtp_session->last_cng_ts = rtp_session->last_read_ts + rtp_session->samples_per_interval;
-                       
+
+                       if (rtp_session->last_cng_ts == rtp_session->last_read_ts + rtp_session->samples_per_interval) {
+                               rtp_session->last_cng_ts = 0;
+                       } else {
+                               rtp_session->last_cng_ts = rtp_session->last_read_ts + rtp_session->samples_per_interval;
+                       }
+
                        memset(data, 0, 2);
                        data[0] = 65;
                        rtp_session->recv_msg.header.pt = (uint32_t) rtp_session->cng_pt ? rtp_session->cng_pt : SWITCH_RTP_CNG_PAYLOAD;