January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7438 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: anthm Date: Wed Jan 30 12:23:36 2008 New Revision: 7438 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: zag Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Jan 30 12:23:36 2008 @@ -133,7 +133,8 @@ MFLAG_INTREE = (1 << 6), MFLAG_WASTE_BANDWIDTH = (1 << 7), MFLAG_FLUSH_BUFFER = (1 << 8), - MFLAG_ENDCONF = (1 << 9) + MFLAG_ENDCONF = (1 << 9), + MFLAG_HAS_AUDIO = (1 << 10) } member_flag_t; typedef enum { @@ -222,6 +223,8 @@ uint8_t min; switch_speech_handle_t lsh; switch_speech_handle_t *sh; + switch_byte_t *not_talking_buf; + uint32_t not_talking_buf_len; } conference_obj_t; /* Relationship with another member */ @@ -715,12 +718,12 @@ conference_member_t *imember, *omember; uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval); uint32_t bytes = samples * 2; - uint8_t ready = 0; + uint8_t ready = 0, total = 0; switch_timer_t timer = { 0 }; switch_event_t *event; uint8_t *file_frame; uint8_t *async_file_frame; - + file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); async_file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); @@ -753,10 +756,11 @@ break; } switch_mutex_lock(conference->mutex); - ready = 0; + ready = total = 0; /* Read one frame of audio from each member channel and save it for redistribution */ for (imember = conference->members; imember; imember = imember->next) { + total++; if (imember->buflen) { memset(imember->frame, 255, imember->buflen); } else { @@ -764,11 +768,12 @@ imember->mux_frame = switch_core_alloc(imember->pool, bytes); imember->buflen = bytes; } - + switch_clear_flag(imember, MFLAG_HAS_AUDIO); switch_mutex_lock(imember->audio_in_mutex); /* if there is audio in the resample buffer it takes precedence over the other data */ if (imember->mux_resampler && switch_buffer_inuse(imember->resample_buffer) >= bytes) { imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes); + switch_set_flag(imember, MFLAG_HAS_AUDIO); ready++; } else if ((imember->read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, imember->buflen))) { /* If the caller is not at the right sample rate resample him to suit and buffer accordingly */ @@ -791,9 +796,11 @@ switch_buffer_write(imember->resample_buffer, out, len); if (switch_buffer_inuse(imember->resample_buffer) >= bytes) { imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes); + switch_set_flag(imember, MFLAG_HAS_AUDIO); ready++; } } else { + switch_set_flag(imember, MFLAG_HAS_AUDIO); ready++; /* Tally of how many channels had data */ } } @@ -861,6 +868,7 @@ } if (ready) { + int nt = 0; /* Build a muxed frame for every member that contains the mixed audio of everyone else */ for (omember = conference->members; omember; omember = omember->next) { omember->len = bytes; @@ -901,6 +909,12 @@ } } } + + if (nt && conference->not_talking_buf_len && !switch_test_flag(omember, MFLAG_HAS_AUDIO)) { + memcpy(omember->mux_frame, conference->not_talking_buf, conference->not_talking_buf_len); + continue; + } + if (imember->read > imember->len) { imember->len = imember->read; @@ -915,8 +929,15 @@ switch_normalize_to_16bit(z); muxed[x] = (int16_t) z; } - - ready++; + + if (total - ready > 1) { + conference->not_talking_buf_len = imember->read; + if (!conference->not_talking_buf) { + conference->not_talking_buf = switch_core_alloc(conference->pool, imember->read + 128); + } + memcpy(conference->not_talking_buf, muxed, conference->not_talking_buf_len); + nt++; + } } } }

1 0

[commit] r7437 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: anthm Date: Wed Jan 30 12:23:17 2008 New Revision: 7437 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: zig Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Jan 30 12:23:17 2008 @@ -1513,7 +1513,8 @@ uint32_t tsamples = member->orig_read_codec->implementation->samples_per_frame; uint32_t low_count = 0, bytes = samples * 2; call_list_t *call_list = NULL, *cp = NULL; - + uint32_t file_intervals = member->conference->interval / (member->orig_read_codec->implementation->microseconds_per_frame / 1000); + switch_assert(member->conference != NULL); if (switch_core_timer_init(& timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) { @@ -1689,6 +1690,7 @@ if (file_sample_len <= 0) { member->fnode->done++; } else { /* there is file node data to deliver */ + int ic; write_frame.data = file_frame; write_frame.datalen = (uint32_t) file_data_len; write_frame.samples = (uint32_t) file_sample_len; @@ -1698,8 +1700,10 @@ } write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); - switch_core_timer_next(&timer); - + for (ic = 0; ic < file_intervals; ic++) { + switch_core_timer_next(&timer); + } + /* forget the conference data we played file node data instead */ switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); }

1 0

[commit] r7436 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: brian Date: Wed Jan 30 10:59:11 2008 New Revision: 7436 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: one more tweak Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Jan 30 10:59:11 2008 @@ -4488,7 +4488,10 @@ } if (!strcasecmp(var, "rate") && !switch_strlen_zero(val)) { - rate_name = val; + uint32_t tmp = atoi(val); + if (tmp == 8000 || tmp == 16000 || tmp == 32000) { + rate_name = val; + } } else if (!strcasecmp(var, "domain") && !switch_strlen_zero(val)) { domain = val; } else if (!strcasecmp(var, "interval") && !switch_strlen_zero(val)) {

1 0

[commit] r7435 - in freeswitch/trunk/src: . mod/applications/mod_conference
by Freeswitch SVN 30 Jan '08

30 Jan '08

Author: brian Date: Wed Jan 30 10:45:52 2008 New Revision: 7435 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_resample.c Log: small tweak to resampler Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Jan 30 10:45:52 2008 @@ -774,7 +774,7 @@ /* If the caller is not at the right sample rate resample him to suit and buffer accordingly */ if (imember->mux_resampler) { int16_t *bptr = (int16_t *) imember->frame; - int16_t out[1024]; + int16_t out[SWITCH_RECOMMENDED_BUFFER_SIZE]; int len = (int) imember->read; imember->mux_resampler->from_len = switch_short_to_float(bptr, imember->mux_resampler->from, (int) len / 2); @@ -784,6 +784,10 @@ switch_float_to_short(imember->mux_resampler->to, out, len); len = imember->mux_resampler->to_len * 2; + if (len > SWITCH_RECOMMENDED_BUFFER_SIZE) { + len = SWITCH_RECOMMENDED_BUFFER_SIZE; + } + switch_buffer_write(imember->resample_buffer, out, len); if (switch_buffer_inuse(imember->resample_buffer) >= bytes) { imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes); Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Wed Jan 30 10:45:52 2008 @@ -143,9 +143,9 @@ if (!fh->resampler) { if (switch_resample_create(&fh->resampler, fh->native_rate, - orig_len * 10, + orig_len, fh->samplerate, - (uint32_t)orig_len * 10, + (uint32_t)orig_len, fh->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); return SWITCH_STATUS_GENERR; @@ -197,9 +197,9 @@ if (!fh->resampler) { if (switch_resample_create(&fh->resampler, fh->native_rate, - orig_len * 10, + orig_len, fh->samplerate, - (uint32_t)orig_len * 10, + (uint32_t)orig_len, fh->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n"); return SWITCH_STATUS_GENERR; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Jan 30 10:45:52 2008 @@ -192,9 +192,9 @@ switch_mutex_lock(session->resample_mutex); status = switch_resample_create(&session->read_resampler, read_frame->codec->implementation->actual_samples_per_second, - read_frame->codec->implementation->bytes_per_frame * 20, + read_frame->codec->implementation->bytes_per_frame, session->read_codec->implementation->actual_samples_per_second, - session->read_codec->implementation->bytes_per_frame * 20, session->pool); + session->read_codec->implementation->bytes_per_frame, session->pool); switch_mutex_unlock(session->resample_mutex); if (status != SWITCH_STATUS_SUCCESS) { @@ -520,9 +520,9 @@ switch_mutex_lock(session->resample_mutex); status = switch_resample_create(&session->write_resampler, frame->codec->implementation->actual_samples_per_second, - frame->codec->implementation->bytes_per_frame * 20, + frame->codec->implementation->bytes_per_frame, session->write_codec->implementation->actual_samples_per_second, - session->write_codec->implementation->bytes_per_frame * 20, session->pool); + session->write_codec->implementation->bytes_per_frame, session->pool); switch_mutex_unlock(session->resample_mutex); if (status != SWITCH_STATUS_SUCCESS) { goto done; @@ -753,9 +753,9 @@ switch_mutex_lock(session->resample_mutex); status = switch_resample_create(&session->read_resampler, frame->codec->implementation->actual_samples_per_second, - frame->codec->implementation->bytes_per_frame * 20, + frame->codec->implementation->bytes_per_frame, session->write_codec->implementation->actual_samples_per_second, - session->write_codec->implementation->bytes_per_frame * 20, session->pool); + session->write_codec->implementation->bytes_per_frame, session->pool); switch_mutex_unlock(session->resample_mutex); if (status != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Wed Jan 30 10:45:52 2008 @@ -51,6 +51,8 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif +#define resample_buffer(a, b, c) a > b ? ((a / 1000) / 2) * c : ((b / 1000) / 2) * c + SWITCH_DECLARE(switch_status_t) switch_resample_create(switch_audio_resampler_t **new_resampler, int from_rate, switch_size_t from_size, int to_rate, uint32_t to_size, switch_memory_pool_t *pool) { @@ -74,9 +76,9 @@ resampler->resampler = resample_open(QUALITY, resampler->factor, resampler->factor); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Activate Resampler %d->%d %f\n", resampler->from_rate, resampler->to_rate, resampler->factor); - resampler->from_size = from_size; + resampler->from_size = resample_buffer(to_rate, from_rate, (uint32_t)from_size); resampler->from = (float *) switch_core_alloc(pool, resampler->from_size); - resampler->to_size = to_size; + resampler->to_size = resample_buffer(to_rate, from_rate, (uint32_t)to_size); ; resampler->to = (float *) switch_core_alloc(pool, resampler->to_size); *new_resampler = resampler;

1 0

[commit] r7434 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: brian Date: Tue Jan 29 17:14:59 2008 New Revision: 7434 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: this seems correct Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Jan 29 17:14:59 2008 @@ -1595,8 +1595,8 @@ } else { const char *a = switch_stristr("AES", tech_pvt->remote_crypto_key); const char *b = switch_stristr("AES", crypto); - - if (a && b && strncasecmp(a, b, 23)) { + + if (a && b && !strncasecmp(a, b, 23)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto); tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); tech_pvt->crypto_tag = crypto_tag;

1 0

[commit] r7433 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: anthm Date: Tue Jan 29 16:56:36 2008 New Revision: 7433 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: possible solution for MODENDP-80 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Tue Jan 29 16:56:36 2008 @@ -36,7 +36,25 @@ */ #include "mod_sofia.h" +static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr, int unreg) +{ + if (gateway_ptr->nh) { + if (unreg) { + nua_unregister(gateway_ptr->nh, + NUTAG_URL(gateway_ptr->register_url), + SIPTAG_FROM_STR(gateway_ptr->register_from), + SIPTAG_TO_STR(gateway_ptr->register_from), + SIPTAG_CONTACT_STR(gateway_ptr->register_contact), + SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), + NUTAG_REGISTRAR(gateway_ptr->register_proxy), + NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); + } + nua_handle_bind(gateway_ptr->nh, NULL); + nua_handle_destroy(gateway_ptr->nh); + gateway_ptr->nh = NULL; + } +} void sofia_reg_unregister(sofia_profile_t *profile) { @@ -44,10 +62,9 @@ for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { if (gateway_ptr->sofia_private) { free(gateway_ptr->sofia_private); - nua_handle_bind(gateway_ptr->nh, NULL); gateway_ptr->sofia_private = NULL; } - nua_handle_destroy(gateway_ptr->nh); + sofia_reg_kill_reg(gateway_ptr, 1); } } @@ -73,25 +90,23 @@ break; case REG_STATE_UNREGISTER: - nua_unregister(gateway_ptr->nh, - NUTAG_URL(gateway_ptr->register_url), - SIPTAG_FROM_STR(gateway_ptr->register_from), - SIPTAG_TO_STR(gateway_ptr->register_from), - SIPTAG_CONTACT_STR(gateway_ptr->register_contact), - SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), - NUTAG_REGISTRAR(gateway_ptr->register_proxy), - NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); + sofia_reg_kill_reg(gateway_ptr, 1); gateway_ptr->state = REG_STATE_NOREG; break; case REG_STATE_UNREGED: + + sofia_reg_kill_reg(gateway_ptr, 1); + if ((gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, NUTAG_URL(gateway_ptr->register_proxy), SIPTAG_TO_STR(gateway_ptr->register_to), NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "registering %s\n", gateway_ptr->name); - gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); - switch_assert(gateway_ptr->sofia_private); + if (!gateway_ptr->sofia_private) { + gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); + switch_assert(gateway_ptr->sofia_private); + } memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); gateway_ptr->sofia_private->gateway = gateway_ptr; @@ -127,6 +142,7 @@ break; case REG_STATE_FAILED: + sofia_reg_kill_reg(gateway_ptr, 0); case REG_STATE_TRYING: if (gateway_ptr->retry && now >= gateway_ptr->retry) { gateway_ptr->state = REG_STATE_UNREGED;

1 0

[commit] r7432 - freeswitch/trunk/src
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 16:46:34 2008 New Revision: 7432 Modified: freeswitch/trunk/src/switch_odbc.c Log: fix switch_odbc build from intralanman Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Tue Jan 29 16:46:34 2008 @@ -355,7 +355,7 @@ for (x = 1; x <= c; x++) { SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; - SQLUINTEGER ColumnSize; + SQLULEN ColumnSize; names[y] = malloc(name_len); memset(names[y], 0, name_len);

1 0

[commit] r7431 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 16:16:13 2008 New Revision: 7431 Modified: freeswitch/trunk/libs/sofia-sip/.update Log: poke Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jan 29 16:16:13 2008 @@ -1 +1 @@ -Tue Jan 29 16:15:12 EST 2008 +Tue Jan 29 16:16:02 EST 2008

1 0

[commit] r7430 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 16:15:25 2008 New Revision: 7430 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Log: whoops from merge conflict Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jan 29 16:15:25 2008 @@ -1 +1 @@ -Sat Jan 26 14:48:35 EST 2008 +Tue Jan 29 16:15:12 EST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Tue Jan 29 16:15:25 2008 @@ -1049,7 +1049,6 @@ su_msg_t *msg; assert(rmsg); - rmsg[0] = NULL; msg = rmsg[0], rmsg[0] = NULL;

1 0

[commit] r7429 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: anthm Date: Tue Jan 29 15:58:30 2008 New Revision: 7429 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix seg Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Jan 29 15:58:30 2008 @@ -1746,7 +1746,7 @@ if (holder->http) { char aval[512]; - switch_amp_encode(argv[x], aval, sizeof(aval)); + switch_amp_encode(val, aval, sizeof(aval)); holder->stream->write_function(holder->stream, "<td>"); holder->stream->write_function(holder->stream, "%s%s", aval, x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); } else {

1 0