- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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] r7462 - freeswitch/trunk/scripts/contrib/trixter unsupported/trixter
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: brian Date: Fri Feb 1 10:46:16 2008 New Revision: 7462 Added: freeswitch/trunk/scripts/contrib/trixter/ - copied from r7461, /unsupported/trixter/ Changes in other areas also in this revision: Removed: unsupported/trixter/ Log: mv from back Diffs of changes in other areas also in this revision:

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] 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

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

01 Feb '08

Author: anthm Date: Fri Feb 1 09:24:35 2008 New Revision: 7455 Modified: freeswitch/trunk/Makefile.am Log: update makefile Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Feb 1 09:24:35 2008 @@ -287,6 +287,7 @@ speedy-sure: update-clean $(MAKE) -j core + cd libs/sofia-sip && $(MAKE) -j $(MAKE) -j modules current: update-clean @@ -294,6 +295,11 @@ $(MAKE) all $(MAKE) install +speedy-current: update-clean + svn update + $(MAKE) speedy-sure + $(MAKE) install + wayclean: clean modules: libfreeswitch.la

1 0

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

01 Feb '08

Author: brian Date: Fri Feb 1 01:36:42 2008 New Revision: 7454 Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Log: wth was I thinking here hehe Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Fri Feb 1 01:36:42 2008 @@ -51,23 +51,7 @@ packing = G726_PACKING_LEFT; } - switch (codec->implementation->bits_per_second) { - case 40000: - g726_init(context, codec->implementation->bits_per_second, G726_ENCODING_LINEAR, packing); - break; - case 32000: - g726_init(context, codec->implementation->bits_per_second, G726_ENCODING_LINEAR, packing); - break; - case 24000: - g726_init(context, codec->implementation->bits_per_second, G726_ENCODING_LINEAR, packing); - break; - case 16000: - g726_init(context, codec->implementation->bits_per_second, G726_ENCODING_LINEAR, packing); - break; - default: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid Encoding Size %d!\n", codec->implementation->encoded_bytes_per_frame); - return SWITCH_STATUS_FALSE; - } + g726_init(context, codec->implementation->bits_per_second, G726_ENCODING_LINEAR, packing); codec->private_info = context; return SWITCH_STATUS_SUCCESS;

1 0

[commit] r7453 - freeswitch/trunk/libs/codec/g726
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: brian Date: Fri Feb 1 01:25:48 2008 New Revision: 7453 Removed: freeswitch/trunk/libs/codec/g726/ Log: remove old g726 we no longer use

1 0