- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4474 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 18:48:02 2007 New Revision: 4474 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: update contd Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 18:48:02 2007 @@ -2460,6 +2460,10 @@ if (!cng_pt && !strcasecmp(map->rm_encoding, "CN")) { cng_pt = tech_pvt->cng_pt = (switch_payload_t)map->rm_pt; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", cng_pt); + if (tech_pvt->rtp_session) { + switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt); + switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_AUTO_CNG); + } } if (match) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 7 18:48:02 2007 @@ -820,11 +820,10 @@ check = (uint8_t)(switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) && - rtp_session->timer.samplecount >= (rtp_session->last_write_ts + (rtp_session->packet_size * 5))) { + rtp_session->timer.samplecount >= (rtp_session->last_write_ts + (rtp_session->packet_size * 50))) { uint8_t data[2] = {0}; switch_frame_flag_t flags = SFF_NONE; data[0] = 127; - printf("WTF %u %u\n", rtp_session->timer.samplecount, (rtp_session->last_write_ts + (rtp_session->packet_size * 5))); rtp_session->last_write_ts = rtp_session->timer.samplecount; rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq);

1 0

[commit] r4473 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia mod/timers/mod_softtimer
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 18:24:09 2007 New Revision: 4473 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/trunk/src/switch_rtp.c Log: wip Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 18:24:09 2007 @@ -787,9 +787,10 @@ if (tech_pvt->te > 95) { 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); } - - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, rate); - + if (tech_pvt->cng_pt) { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, rate); + tech_pvt->cng_pt = 0; + } if (ptime) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); } Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Wed Mar 7 18:24:09 2007 @@ -53,6 +53,7 @@ switch_size_t reference; switch_size_t start; uint32_t roll; + uint32_t ready; }; typedef struct timer_private timer_private_t; @@ -83,6 +84,7 @@ timer->private_info = private_info; private_info->start = private_info->reference = TIMER_MATRIX[timer->interval].tick; private_info->roll = TIMER_MATRIX[timer->interval].roll; + private_info->ready = 1; return SWITCH_STATUS_SUCCESS; } @@ -102,7 +104,7 @@ timer_private_t *private_info = timer->private_info; uint64_t samples; - if (globals.RUNNING != 1) { + if (globals.RUNNING != 1 || private_info->ready == 0) { return SWITCH_STATUS_FALSE; } @@ -127,7 +129,7 @@ timer_step(timer); - while (globals.RUNNING == 1 && TIMER_MATRIX[timer->interval].tick < private_info->reference) { + while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) { check_roll(); switch_yield(1000); } @@ -146,7 +148,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; switch_size_t diff; - if (globals.RUNNING != 1) { + if (globals.RUNNING != 1 || !private_info->ready) { return SWITCH_STATUS_SUCCESS; } @@ -170,13 +172,14 @@ static inline switch_status_t timer_destroy(switch_timer_t *timer) { + timer_private_t *private_info = timer->private_info; switch_mutex_lock(globals.mutex); TIMER_MATRIX[timer->interval].count--; if (TIMER_MATRIX[timer->interval].count == 0) { TIMER_MATRIX[timer->interval].tick = 0; } switch_mutex_unlock(globals.mutex); - timer->private_info = NULL; + private_info->ready = 0; return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 7 18:24:09 2007 @@ -779,8 +779,12 @@ switch_core_timer_step(&rtp_session->timer); } - if (rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { - *flags |= SFF_CNG; + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { + return -1; + } + + if (rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { + continue; } if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { @@ -795,10 +799,6 @@ return 2 + rtp_header_len; } - if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { - return -1; - } - if (bytes < 0) { return (int)bytes; } else if (bytes > 0 && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { @@ -824,7 +824,7 @@ uint8_t data[2] = {0}; switch_frame_flag_t flags = SFF_NONE; data[0] = 127; - + printf("WTF %u %u\n", rtp_session->timer.samplecount, (rtp_session->last_write_ts + (rtp_session->packet_size * 5))); rtp_session->last_write_ts = rtp_session->timer.samplecount; rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq); @@ -958,12 +958,13 @@ SWITCH_DECLARE(switch_size_t) switch_rtp_has_dtmf(switch_rtp_t *rtp_session) { - switch_size_t has; + switch_size_t has = 0; - assert(rtp_session != NULL); - switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex); - has = switch_buffer_inuse(rtp_session->dtmf_data.dtmf_buffer); - switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex); + if (switch_rtp_ready(rtp_session)) { + switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex); + has = switch_buffer_inuse(rtp_session->dtmf_data.dtmf_buffer); + switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex); + } return has; } @@ -975,7 +976,9 @@ switch_size_t wr = 0; char *p; - assert(rtp_session != NULL); + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex); @@ -1005,9 +1008,11 @@ SWITCH_DECLARE(switch_size_t) switch_rtp_dequeue_dtmf(switch_rtp_t *rtp_session, char *dtmf, switch_size_t len) { - switch_size_t bytes; + switch_size_t bytes = 0; - assert(rtp_session != NULL); + if (!switch_rtp_ready(rtp_session)) { + return bytes; + } switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex); if ((bytes = switch_buffer_read(rtp_session->dtmf_data.dtmf_buffer, dtmf, len)) > 0) { @@ -1024,6 +1029,10 @@ { char *c; + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + if (!rtp_session->dtmf_data.dtmf_queue) { switch_queue_create(&rtp_session->dtmf_data.dtmf_queue, 100, rtp_session->pool); } @@ -1046,8 +1055,13 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_read(switch_rtp_t *rtp_session, void *data, uint32_t *datalen, switch_payload_t *payload_type, switch_frame_flag_t *flags) { + int bytes = 0; - int bytes = rtp_common_read(rtp_session, payload_type, flags); + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + + bytes = rtp_common_read(rtp_session, payload_type, flags); if (bytes < 0) { *datalen = 0; @@ -1068,7 +1082,13 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp_session, switch_frame_t *frame) { - int bytes = rtp_common_read(rtp_session, &frame->payload, &frame->flags); + int bytes = 0; + + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + + bytes = rtp_common_read(rtp_session, &frame->payload, &frame->flags); frame->data = rtp_session->recv_msg.body; frame->packet = &rtp_session->recv_msg; @@ -1099,7 +1119,13 @@ switch_frame_flag_t *flags) { - int bytes = rtp_common_read(rtp_session, payload_type, flags); + int bytes = 0; + + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + + bytes = rtp_common_read(rtp_session, payload_type, flags); *data = rtp_session->recv_msg.body; if (bytes < 0) { @@ -1116,10 +1142,16 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint8_t m, switch_payload_t payload, switch_frame_flag_t *flags) { switch_size_t bytes; - uint8_t fwd = (uint8_t)(!flags || (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP))); + uint8_t fwd = 0; rtp_msg_t *send_msg; uint8_t send = 1; + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + + fwd = (uint8_t)(!flags || (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP))); + if (fwd) { bytes = datalen; send_msg = (rtp_msg_t *) data; @@ -1283,6 +1315,11 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_disable_vad(switch_rtp_t *rtp_session) { + + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VAD)) { return SWITCH_STATUS_GENERR; } @@ -1293,6 +1330,11 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_enable_vad(switch_rtp_t *rtp_session, switch_core_session_t *session, switch_codec_t *codec, switch_vad_flag_t flags) { + + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VAD)) { return SWITCH_STATUS_GENERR; } @@ -1334,6 +1376,10 @@ { uint8_t mark = 0; + if (!switch_rtp_ready(rtp_session)) { + return -1; + } + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; } @@ -1359,13 +1405,21 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, uint32_t ts) { - uint8_t fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && switch_test_flag(frame, SFF_RAW_RTP)) ? 1 : 0; - uint8_t packetize = (rtp_session->packet_size > frame->datalen && (frame->payload == rtp_session->payload)) ? 1 : 0; + uint8_t fwd = 0; + uint8_t packetize = 0; void *data; uint32_t len; uint8_t mark = 0; switch_payload_t payload; + + if (!switch_rtp_ready(rtp_session)) { + return -1; + } + + fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && switch_test_flag(frame, SFF_RAW_RTP)) ? 1 : 0; + packetize = (rtp_session->packet_size > frame->datalen && (frame->payload == rtp_session->payload)) ? 1 : 0; + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; } @@ -1423,6 +1477,10 @@ { rtp_msg_t send_msg = {{0}}; + if (!switch_rtp_ready(rtp_session)) { + return -1; + } + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; }

1 0

[commit] r4472 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 17:30:29 2007 New Revision: 4472 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: you can't handle the truth Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 17:30:29 2007 @@ -874,7 +874,7 @@ switch_core_session_add_stream(session, NULL); channel = switch_core_session_get_channel(session); - switch_channel_set_flag(channel, CF_ACCEPT_CNG); + //switch_channel_set_flag(channel, CF_ACCEPT_CNG); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_lock(tech_pvt->flag_mutex);

1 0

[commit] r4471 - in freeswitch/trunk/src: . include mod/languages/mod_spidermonkey
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 17:17:02 2007 New Revision: 4471 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h freeswitch/trunk/src/switch_utils.c Log: fix fatal include Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Wed Mar 7 17:17:02 2007 @@ -289,6 +289,7 @@ #define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) SWITCH_DECLARE(size_t) switch_url_encode(char *url, char *buf, size_t len); SWITCH_DECLARE(char *) switch_url_decode(char *s); +SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename); SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Wed Mar 7 17:17:02 2007 @@ -7,7 +7,7 @@ MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js --prefix=$(PREFIX) --with-pic --with-nspr=yes MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl --prefix=$(PREFIX) --without-libidn -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).h $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Mar 7 17:17:02 2007 @@ -2248,7 +2248,9 @@ { char *code; if ( argc > 0 && (code = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) { - eval_some_js(code, cx, obj, rval); + if (eval_some_js(code, cx, obj, rval) < 0) { + return JS_FALSE; + } return JS_TRUE; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Arguements\n"); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Wed Mar 7 17:17:02 2007 @@ -81,7 +81,8 @@ JSScript *script = NULL; char *cptr; char *path = NULL; - int res = 0; + char *script_name; + int result = 0; JS_ClearPendingException(cx); @@ -90,19 +91,28 @@ script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1); } else { if (*code == '/') { - script = JS_CompileFile(cx, obj, code); + script_name = code; } else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) { - script = JS_CompileFile(cx, obj, path); - switch_safe_free(path); + script_name = path; } + if (script_name) { + if (switch_file_exists(script_name) == SWITCH_STATUS_SUCCESS) { + script = JS_CompileFile(cx, obj, script_name); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File: %s\n", script_name); + } + } } - + if (script) { - res = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0; + result = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0; JS_DestroyScript(cx, script); + } else { + result = -1; } - - return res; + + switch_safe_free(path); + return result; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Mar 7 17:17:02 2007 @@ -331,6 +331,20 @@ } +SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename) +{ + int32_t wanted = APR_FINFO_TYPE; + apr_finfo_t info = {0}; + if (filename) { + apr_stat(&info, filename, wanted, NULL); + if (info.filetype != APR_NOFILE) { + return SWITCH_STATUS_SUCCESS; + } + } + return SWITCH_STATUS_FALSE; +} + + SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { switch(priority) { /*lol*/

1 0

[commit] r4470 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 16:21:42 2007 New Revision: 4470 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: update wip Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 16:21:42 2007 @@ -874,6 +874,8 @@ switch_core_session_add_stream(session, NULL); channel = switch_core_session_get_channel(session); + switch_channel_set_flag(channel, CF_ACCEPT_CNG); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_lock(tech_pvt->flag_mutex); tech_pvt->flags = profile->flags; @@ -1891,14 +1893,15 @@ switch_set_flag_locked(tech_pvt, TFLAG_WRITING); + if (!switch_test_flag(frame, SFF_CNG)) { + if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = ((int) frame->datalen / bytes); + } else + frames = 1; - if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = ((int) frame->datalen / bytes); - } else - frames = 1; - - samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; + samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; + } #if 0 printf("%s %s->%s send %d bytes %d samples in %d frames ts=%d\n", Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 7 16:21:42 2007 @@ -1364,11 +1364,24 @@ void *data; uint32_t len; uint8_t mark = 0; + switch_payload_t payload; if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; } + assert(frame != NULL); + + if (switch_test_flag(frame, SFF_CNG)) { + payload = rtp_session->cng_pt; + } else { + payload = frame->payload; + } + + if (payload) { + payload = rtp_session->payload; + } + if (fwd && !packetize) { data = frame->packet; len = frame->packetlen; @@ -1394,7 +1407,7 @@ rtp_session->send_msg.header.ts = htonl(rtp_session->ts); } - return rtp_common_write(rtp_session, data, len, mark, rtp_session->payload, &frame->flags); + return rtp_common_write(rtp_session, data, len, mark, payload, &frame->flags); }

1 0

[commit] r4469 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 15:23:14 2007 New Revision: 4469 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: a need a drink Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 15:23:14 2007 @@ -695,6 +695,7 @@ char buf[2048]; switch_time_t now = switch_time_now(); int ptime = 0; + int rate; if (!force && !ip && !sr && switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return; @@ -757,6 +758,7 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "\n"); 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); 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); @@ -769,6 +771,9 @@ int i; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; + if (!rate) { + 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); } @@ -783,7 +788,7 @@ 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); } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, tech_pvt->read_codec.implementation->samples_per_second); + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, rate); if (ptime) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime);

1 0

[commit] r4468 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 15:06:47 2007 New Revision: 4468 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: wtf Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 15:06:47 2007 @@ -1625,7 +1625,6 @@ switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); if (tech_pvt->cng_pt) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "WTF %d", tech_pvt->cng_pt); switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt); }

1 0

[commit] r4467 - in freeswitch/trunk/src: . mod/codecs/mod_g729 mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 15:06:15 2007 New Revision: 4467 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: sigh Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Wed Mar 7 15:06:15 2007 @@ -214,10 +214,10 @@ } } - } //else { - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "yo this frame is an odd size [%d]\n", encoded_data_len); - //return SWITCH_STATUS_FALSE; - //} + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "yo this frame is an odd size [%d]\n", encoded_data_len); + return SWITCH_STATUS_FALSE; + } return SWITCH_STATUS_SUCCESS; #endif } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 15:06:15 2007 @@ -750,10 +750,6 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->te); } - if (tech_pvt->read_codec.implementation->samples_per_second == 8000) { - tech_pvt->cng_pt = SWITCH_RTP_CNG_PAYLOAD; - } - if (tech_pvt->cng_pt) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->cng_pt); } @@ -880,13 +876,13 @@ tech_pvt->profile = profile; if (tech_pvt->bte) { tech_pvt->te = tech_pvt->bte; - } else { + } else if (!tech_pvt->te) { tech_pvt->te = profile->te; } if (tech_pvt->bcng_pt) { tech_pvt->cng_pt = tech_pvt->bcng_pt; - } else { + } else if (!tech_pvt->cng_pt) { tech_pvt->cng_pt = profile->cng_pt; } @@ -1629,6 +1625,7 @@ switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); if (tech_pvt->cng_pt) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "WTF %d", tech_pvt->cng_pt); switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt); } @@ -1829,7 +1826,7 @@ if (tech_pvt->read_frame.datalen > 0) { size_t bytes = 0; int frames = 1; - //tech_pvt->last_read = switch_time_now(); + if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) { if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame)) { frames = (tech_pvt->read_frame.datalen / bytes); @@ -2390,7 +2387,7 @@ static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp) { uint8_t match = 0; - switch_payload_t te = 0; + switch_payload_t te = 0, cng_pt = 0; private_object_t *tech_pvt; sdp_media_t *m; sdp_attribute_t *a; @@ -2449,10 +2446,16 @@ if (!te && !strcasecmp(map->rm_encoding, "telephone-event")) { te = tech_pvt->te = (switch_payload_t)map->rm_pt; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set 2833 dtmf payload to %u\n", te); } + if (!cng_pt && !strcasecmp(map->rm_encoding, "CN")) { + cng_pt = tech_pvt->cng_pt = (switch_payload_t)map->rm_pt; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", cng_pt); + } + if (match) { - if (te) { + if (te && cng_pt) { break; } continue; @@ -5305,7 +5308,7 @@ } if (!profile->cng_pt) { - profile->cng_pt = 127; + profile->cng_pt = SWITCH_RTP_CNG_PAYLOAD; } if (!profile->sipip) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 7 15:06:15 2007 @@ -779,6 +779,10 @@ switch_core_timer_step(&rtp_session->timer); } + if (rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { + *flags |= SFF_CNG; + } + if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK);

1 0

[commit] r4466 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 14:41:15 2007 New Revision: 4466 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: update Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Wed Mar 7 14:41:15 2007 @@ -214,10 +214,10 @@ } } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "yo this frame is an odd size [%d]\n", encoded_data_len); - return SWITCH_STATUS_FALSE; - } + } //else { + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "yo this frame is an odd size [%d]\n", encoded_data_len); + //return SWITCH_STATUS_FALSE; + //} return SWITCH_STATUS_SUCCESS; #endif }

1 0

[commit] r4465 - freeswitch/trunk/src
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 13:51:38 2007 New Revision: 4465 Modified: freeswitch/trunk/src/switch_rtp.c Log: amendment to the last commit Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 7 13:51:38 2007 @@ -133,7 +133,6 @@ switch_rtp_invalid_handler_t invalid_handler; void *private_data; uint32_t ts; - uint32_t auto_write_ts; uint32_t last_write_ts; uint16_t last_write_seq; uint32_t last_write_ssrc; @@ -817,16 +816,16 @@ check = (uint8_t)(switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) && - rtp_session->timer.samplecount >= (rtp_session->auto_write_ts + (rtp_session->packet_size * 5))) { + rtp_session->timer.samplecount >= (rtp_session->last_write_ts + (rtp_session->packet_size * 5))) { uint8_t data[2] = {0}; switch_frame_flag_t flags = SFF_NONE; data[0] = 127; - rtp_session->auto_write_ts = rtp_session->timer.samplecount; + rtp_session->last_write_ts = rtp_session->timer.samplecount; rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq); rtp_session->send_msg.header.seq = rtp_session->seq; - rtp_session->send_msg.header.ts = htonl(rtp_session->auto_write_ts); + rtp_session->send_msg.header.ts = htonl(rtp_session->last_write_ts); rtp_common_write(rtp_session, (void *) data, sizeof(data), 0, rtp_session->cng_pt, &flags); } @@ -1336,7 +1335,7 @@ } if (!ts && rtp_session->timer.timer_interface) { - rtp_session->auto_write_ts = rtp_session->ts = rtp_session->timer.samplecount; + rtp_session->ts = rtp_session->timer.samplecount; } else { rtp_session->ts = ts; } @@ -1376,7 +1375,7 @@ if (frame->timestamp) { rtp_session->ts = (uint32_t) frame->timestamp; } else if (!ts && rtp_session->timer.timer_interface) { - rtp_session->auto_write_ts = rtp_session->ts = rtp_session->timer.samplecount; + rtp_session->ts = rtp_session->timer.samplecount; } else { rtp_session->ts = ts; }

1 0