- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7466 - freeswitch/trunk/src/mod/directories/mod_ldap
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: mikej Date: Fri Feb 1 13:52:54 2008 New Revision: 7466 Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile Log: fix for FSBUILD-35, build w/o slapd. thanks skopii Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/Makefile Fri Feb 1 13:52:54 2008 @@ -16,7 +16,7 @@ $(LDAP_DIR): $(GETLIB) $(LDAP).tgz - cd $(LDAP_DIR) && ./configure $(DEFAULT_ARGS) --disable-bdb --disable-hdb + cd $(LDAP_DIR) && ./configure $(DEFAULT_ARGS) --disable-bdb --disable-hdb --disable-slapd $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR) cd $(LDAP_DIR) && $(MAKE)

1 0

[commit] r7465 - in freeswitch/trunk/src: include mod/applications/mod_conference
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: anthm Date: Fri Feb 1 13:43:25 2008 New Revision: 7465 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Feb 1 13:43:25 2008 @@ -296,7 +296,7 @@ #define SWITCH_MAX_STACKS 32 #define SWITCH_THREAD_STACKSIZE 240 * 1024 -#define SWITCH_RECOMMENDED_BUFFER_SIZE 3968 +#define SWITCH_RECOMMENDED_BUFFER_SIZE 8000 #define SWITCH_MAX_CODECS 30 #define SWITCH_MAX_STATE_HANDLERS 30 #define SWITCH_CORE_QUEUE_LEN 100000 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 Fri Feb 1 13:43:25 2008 @@ -255,14 +255,11 @@ uint8_t *frame; uint32_t frame_size; uint8_t *mux_frame; - uint32_t buflen; - uint32_t framelen; uint32_t read; int32_t energy_level; int32_t volume_in_level; int32_t volume_out_level; uint32_t native_rate; - switch_audio_resampler_t *mux_resampler; switch_audio_resampler_t *read_resampler; int16_t *resample_out; uint32_t resample_out_len; @@ -731,7 +728,6 @@ file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); async_file_frame = switch_core_alloc(conference->pool, SWITCH_RECOMMENDED_BUFFER_SIZE); - if (switch_core_timer_init(&timer, conference->timer_name, conference->interval, samples, conference->pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer success interval: %u samples: %u\n", conference->interval, samples); } else { @@ -765,44 +761,17 @@ /* Read one frame of audio from each member channel and save it for redistribution */ for (imember = conference->members; imember; imember = imember->next) { uint32_t buf_read = 0; - uint32_t buf_read_max = imember->framelen; total++; imember->read = 0; switch_clear_flag_locked(imember, MFLAG_HAS_AUDIO); switch_mutex_lock(imember->audio_in_mutex); - if (imember->read_resampler) { - buf_read_max = bytes; - } - - if ((buf_read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, buf_read_max))) { - /* If the caller is not at the right sample rate resample him to suit and buffer accordingly */ - switch_audio_resampler_t *mux_resampler = imember->mux_resampler; - if (mux_resampler) { - int16_t *bptr = (int16_t *) imember->frame; - switch_assert(buf_read <= mux_resampler->from_size); - mux_resampler->from_len = switch_short_to_float(bptr, mux_resampler->from, (int) buf_read / 2); - mux_resampler->to_len = switch_resample_process(mux_resampler, - mux_resampler->from, - mux_resampler->from_len, - mux_resampler->to, - mux_resampler->to_size, 0); - - switch_float_to_short(mux_resampler->to, imember->resample_out, mux_resampler->to_len); - switch_buffer_write(imember->resample_buffer, imember->resample_out, mux_resampler->to_len * 2); - - if (switch_buffer_inuse(imember->resample_buffer) >= bytes) { - if ((imember->read = (uint32_t) switch_buffer_read(imember->resample_buffer, imember->frame, bytes))) { - switch_set_flag(imember, MFLAG_HAS_AUDIO); - ready++; - } - } - } else { - imember->read = buf_read; - switch_set_flag_locked(imember, MFLAG_HAS_AUDIO); - ready++; - } + if (switch_buffer_inuse(imember->audio_buffer) >= bytes + && (buf_read = (uint32_t) switch_buffer_read(imember->audio_buffer, imember->frame, bytes))) { + imember->read = buf_read; + switch_set_flag_locked(imember, MFLAG_HAS_AUDIO); + ready++; } switch_mutex_unlock(imember->audio_in_mutex); } @@ -1408,7 +1377,6 @@ } if ((samples = read_frame->datalen / sizeof(*data))) { - for (i = 0; i < samples; i++) { energy += abs(data[j]); j += read_codec->implementation->number_of_channels; @@ -1495,8 +1463,6 @@ } switch_resample_destroy(&member->read_resampler); - switch_resample_destroy(&member->mux_resampler); - switch_clear_flag_locked(member, MFLAG_ITHREAD); return NULL; @@ -1546,6 +1512,7 @@ switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session); uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval); + uint32_t flush_len = switch_bytes_per_frame(member->conference->rate, member->conference->interval) * 4; uint32_t csamples = samples; uint32_t tsamples = member->orig_read_codec->implementation->samples_per_frame; uint32_t low_count = 0, bytes = samples * 2; @@ -1754,7 +1721,7 @@ switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } mux_used = 0; - } else if (mux_used > bytes * 4) { + } else if (mux_used > flush_len) { /* getting behind, clear the buffer */ switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } @@ -3879,9 +3846,6 @@ char *dpin = NULL; conf_xml_cfg_t xml_cfg = { 0 }; switch_event_t *params = NULL; - uint32_t buflen; - uint32_t rinterval; - if (switch_strlen_zero(data)) { @@ -4140,27 +4104,17 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + flags = 0; goto done; } - buflen = switch_bytes_per_frame(conference->rate, conference->interval); - rinterval = read_codec->implementation->microseconds_per_frame / 1000; - - member.framelen = member.read_codec.implementation->bytes_per_frame * ((conference->interval > rinterval) ? conference->interval / rinterval : 1); - member.buflen = buflen; - member.frame_size = (member.framelen + member.buflen) * 4; - + member.frame_size = switch_bytes_per_frame(conference->rate, conference->interval) * 4; member.frame = switch_core_alloc(member.pool, member.frame_size); member.mux_frame = switch_core_alloc(member.pool, member.frame_size); - - - + if (read_codec->implementation->actual_samples_per_second != conference->rate) { - switch_audio_resampler_t **resampler = read_codec->implementation->actual_samples_per_second > conference->rate ? - &member.read_resampler : &member.mux_resampler; - - if (switch_resample_create(resampler, + if (switch_resample_create(&member.read_resampler, read_codec->implementation->actual_samples_per_second, member.frame_size, conference->rate,

1 0

[commit] r7464 - freeswitch/trunk/src/mod/codecs/mod_g722
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: brian Date: Fri Feb 1 12:28:00 2008 New Revision: 7464 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Log: woops Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Fri Feb 1 12:28:00 2008 @@ -131,6 +131,7 @@ mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, switch_g722_init, switch_g722_encode, switch_g722_decode, switch_g722_destroy); } + SWITCH_ADD_CODEC(codec_interface, "G.722_8"); for (count = 12; count > 0; count--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, 109, "G722_8", NULL, 8000, 8000, 64000,

1 0

[commit] r7463 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: anthm Date: Fri Feb 1 11:44:41 2008 New Revision: 7463 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update 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 Fri Feb 1 11:44:41 2008 @@ -225,6 +225,7 @@ switch_speech_handle_t *sh; switch_byte_t *not_talking_buf; uint32_t not_talking_buf_len; + int comfort_noise_level; } conference_obj_t; /* Relationship with another member */ @@ -875,10 +876,19 @@ uint32_t sample_bytes = file_sample_len * 2; memcpy(omember->mux_frame, file_frame, sample_bytes); if (sample_bytes < bytes) { - memset(omember->mux_frame + sample_bytes, 255, bytes - sample_bytes); + if (conference->comfort_noise_level) { + switch_generate_sln_silence((int16_t *)omember->mux_frame + sample_bytes, + (bytes - sample_bytes) / 2, conference->comfort_noise_level); + } else { + memset(omember->mux_frame + sample_bytes, 255, bytes - sample_bytes); + } } } else { - memset(omember->mux_frame, 255, bytes); + if (conference->comfort_noise_level) { + switch_generate_sln_silence((int16_t *)omember->mux_frame, bytes / 2, conference->comfort_noise_level); + } else { + memset(omember->mux_frame, 255, bytes); + } } for (imember = conference->members; imember; imember = imember->next) { uint32_t x; @@ -1760,13 +1770,14 @@ switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER); } + use_timer = 1; + if (mux_used) { /* 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; use_buffer = member->mux_buffer; low_count = 0; - use_timer = 1; if ((write_frame.datalen = (uint32_t) switch_buffer_read(use_buffer, write_frame.data, bytes))) { if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { write_frame.samples = write_frame.datalen / 2; @@ -1785,13 +1796,16 @@ } else { if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { - switch_generate_sln_silence(write_frame.data, samples, 1400); + if (member->conference->comfort_noise_level) { + switch_generate_sln_silence(write_frame.data, samples, member->conference->comfort_noise_level); + } else { + memset(write_frame.data, 255, bytes); + } write_frame.datalen = bytes; write_frame.samples = samples; write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); } - use_timer = 1; } } @@ -4513,6 +4527,7 @@ char *maxmember_sound = NULL; uint32_t rate = 8000, interval = 20; switch_status_t status; + int comfort_noise_level = 0; /* Validate the conference name */ if (switch_strlen_zero(name)) { @@ -4594,6 +4609,14 @@ caller_id_number = val; } else if (!strcasecmp(var, "caller-controls") && !switch_strlen_zero(val)) { caller_controls = val; + } else if (!strcasecmp(var, "comfort-noise") && !switch_strlen_zero(val)) { + int tmp; + tmp = atoi(val); + if (tmp > 1 && tmp < 10000) { + comfort_noise_level = tmp; + } else if (switch_true(val)) { + comfort_noise_level = 1400; + } } else if (!strcasecmp(var, "sound-prefix") && !switch_strlen_zero(val)) { sound_prefix = val; } else if (!strcasecmp(var, "max-members") && !switch_strlen_zero(val)) { @@ -4679,6 +4702,7 @@ conference->tts_voice = switch_core_strdup(conference->pool, tts_voice); } + conference->comfort_noise_level = comfort_noise_level; conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name); conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number);

1 0

[commit] r7461 - freeswitch/branches/anthonyl/spidermonkey-stuff/src
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: anthonyl Date: Fri Feb 1 10:45:09 2008 New Revision: 7461 Modified: freeswitch/branches/anthonyl/spidermonkey-stuff/src/switch_core_directory.c Log: this is needed to support adding ldap entires from within the directory interface javascript code or the directory interface itself. Modified: freeswitch/branches/anthonyl/spidermonkey-stuff/src/switch_core_directory.c ============================================================================== --- freeswitch/branches/anthonyl/spidermonkey-stuff/src/switch_core_directory.c (original) +++ freeswitch/branches/anthonyl/spidermonkey-stuff/src/switch_core_directory.c Fri Feb 1 10:45:09 2008 @@ -84,3 +84,14 @@ return status; } +SWITCH_DECLARE(switch_status_t) switch_core_directory_append(switch_directory_handle_t *dh) +{ + switch_status_t status; + + status = dh->directory_interface->directory_append(dh); + + if (switch_test_flag(dh, SWITCH_DIRECTORY_FLAG_FREE_POOL)) { + switch_core_destory_memory_poll(&dh->memory_poll); + } + return status; +}

1 0

[commit] r7460 - freeswitch/trunk
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: brian Date: Fri Feb 1 10:44:57 2008 New Revision: 7460 Modified: freeswitch/trunk/bootstrap.sh Log: remove g726 Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Fri Feb 1 10:44:57 2008 @@ -3,7 +3,7 @@ BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; -SUBDIRS="codec/g7xx codec/g726 codec/gsm codec/ilbc codec/lpc10 curl iax iksemel \ +SUBDIRS="codec/g7xx codec/gsm codec/ilbc codec/lpc10 curl iax iksemel \ js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ speex sqlite srtp xmlrpc-c";

1 0

[commit] r7459 - freeswitch/branches/anthonyl/spidermonkey-stuff/src/include
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: anthonyl Date: Fri Feb 1 10:42:49 2008 New Revision: 7459 Modified: freeswitch/branches/anthonyl/spidermonkey-stuff/src/include/switch_module_interfaces.h Log: update. Modified: freeswitch/branches/anthonyl/spidermonkey-stuff/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/branches/anthonyl/spidermonkey-stuff/src/include/switch_module_interfaces.h (original) +++ freeswitch/branches/anthonyl/spidermonkey-stuff/src/include/switch_module_interfaces.h Fri Feb 1 10:42:49 2008 @@ -436,7 +436,8 @@ switch_status_t (*directory_next) (switch_directory_handle_t *dh); /*! function to advance to the next name/value pair in the current record */ switch_status_t (*directory_next_pair) (switch_directory_handle_t *dh, char **var, char **val); - + /*! function to append a new entry */ + switch_status_t (*directory_append) (switch_directory_handle_t *dh, char **var, char **val); struct switch_directory_interface *next; };

1 0

[commit] r7458 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: anthm Date: Fri Feb 1 10:17:38 2008 New Revision: 7458 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: 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 Fri Feb 1 10:17:38 2008 @@ -871,11 +871,14 @@ 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->read = bytes; if (has_file_data && file_sample_len) { - memcpy(omember->mux_frame, file_frame, file_sample_len * 2); - } else { - memset(omember->mux_frame, 0, omember->read); + uint32_t sample_bytes = file_sample_len * 2; + memcpy(omember->mux_frame, file_frame, sample_bytes); + if (sample_bytes < bytes) { + memset(omember->mux_frame + sample_bytes, 255, bytes - sample_bytes); + } + } else { + memset(omember->mux_frame, 255, bytes); } for (imember = conference->members; imember; imember = imember->next) { uint32_t x; @@ -937,7 +940,7 @@ for (imember = conference->members; imember; imember = imember->next) { if (switch_test_flag(imember, MFLAG_RUNNING)) { switch_mutex_lock(imember->audio_out_mutex); - switch_buffer_write(imember->mux_buffer, imember->mux_frame, imember->read); + switch_buffer_write(imember->mux_buffer, imember->mux_frame, bytes); switch_mutex_unlock(imember->audio_out_mutex); } }

1 0

[commit] r7457 - freeswitch/trunk/src/mod/codecs/mod_g722
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: brian Date: Fri Feb 1 10:06:22 2008 New Revision: 7457 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Log: tweak Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Fri Feb 1 10:06:22 2008 @@ -131,6 +131,12 @@ mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, switch_g722_init, switch_g722_encode, switch_g722_decode, switch_g722_destroy); } + for (count = 12; count > 0; count--) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 109, "G722_8", NULL, 8000, 8000, 64000, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + switch_g722_init, switch_g722_encode, switch_g722_decode, switch_g722_destroy); + } /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r7456 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: brian Date: Fri Feb 1 09:34:13 2008 New Revision: 7456 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml Log: getting closer Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Fri Feb 1 09:34:13 2008 @@ -6,7 +6,7 @@ name can be a file name, function name or 'all' value is one or more of debug,info,notice,warning,err,crit,alert,all --> - <map name="all" value="debug,info,notice,warning,err,crit,alert"/> + <map name="all" value="info,notice,warning,err,crit,alert"/> </mappings> <settings>

1 0