March 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4716 - in freeswitch/trunk/src: . include mod/applications/mod_conference
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 14:50:51 2007 New Revision: 4716 Modified: freeswitch/trunk/src/include/switch_resample.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_resample.c Log: shhhh Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Wed Mar 21 14:50:51 2007 @@ -155,6 +155,14 @@ SWITCH_DECLARE(void) switch_swap_linear(int16_t *buf, int len); /*! + \brief Generate static noise + \param data the audio data buffer + \param samples the number of 2 byte samples + \param divisor the volume factor + */ +SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor); + +/*! \brief Change the volume of a signed linear audio frame \param data the audio data \param samples the number of 2 byte samples 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 Mar 21 14:50:51 2007 @@ -1696,7 +1696,7 @@ } else { if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { - memset(write_frame.data, 255, bytes); + switch_generate_sln_silence(write_frame.data, samples, 1400); write_frame.datalen = bytes; write_frame.samples = samples; write_frame.timestamp = timer.samplecount; Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Wed Mar 21 14:50:51 2007 @@ -183,6 +183,27 @@ } } +SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) +{ + int16_t rnd, x,i; + uint32_t sum_rnd = 0; + + assert(divisor); + + for(i = 0; i < samples; i++, sum_rnd = 0) { + for(x = 0; x < 7; x++) { + rnd = (int16_t) (rand() * sizeof(int16_t)); + sum_rnd += rnd; + } + switch_normalize_to_16bit(sum_rnd); + *data = (int16_t) sum_rnd; + *data /= (int)divisor; + + data++; + } +} + + SWITCH_DECLARE(void) switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol) { double newrate = 0;

1 0

[commit] r4715 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 13:09:39 2007 New Revision: 4715 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix typos 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 Mar 21 13:09:39 2007 @@ -1466,7 +1466,7 @@ samples, NULL) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", - member->conference->timer_name, member->conference->interval, samples); + member->conference->timer_name, interval, samples); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n"); return; @@ -4046,10 +4046,12 @@ NULL, member.pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000); flags = 0; goto done; } @@ -4075,17 +4077,19 @@ if (switch_core_codec_init(&member.write_codec, "L16", NULL, - conference->rate, - conference->interval, + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000); flags = 0; goto codec_done2; }

1 0

[commit] r4714 - in freeswitch/trunk/src/mod: codecs/mod_g723_1 codecs/mod_g729 formats/mod_shout
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 13:04:22 2007 New Revision: 4714 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/trunk/src/mod/formats/mod_shout/Makefile Log: fix makefiles Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Wed Mar 21 13:04:22 2007 @@ -1,6 +1,8 @@ BASE=../../../.. +DIR=$(BASE)/libs/libg723_1 +A=$(DIR)/.libs/libg723.a -LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg723_1; then echo "-I$(PREFIX)/include" ; else echo "-DG723_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg723_1 || echo "-L/usr/local/freeswitch/lib -lg723" +LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG723_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Wed Mar 21 13:04:22 2007 @@ -1,4 +1,7 @@ BASE=../../../.. -LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/g729; then echo "-I$(PREFIX)/include/g729" ; else echo "-DG729_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/g729 || echo "-L/usr/local/freeswitchlib -lg729" +DIR=$(BASE)/libs/libg729 +A=$(DIR)/.libs/libg729.a + +LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Wed Mar 21 13:04:22 2007 @@ -11,8 +11,8 @@ SHOUTLA=$(SHOUT_DIR)/src/libshout.la LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) - +LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) +LOCAL_LDFLAGS += -lspeex MP3SOURCES=common.c dct64_i386.c decode_ntom.c layer3.c tabinit.c interface.c MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o LOCAL_OBJS=$(MP3OBJS)

1 0

[commit] r4713 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 11:13:39 2007 New Revision: 4713 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: doh Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Wed Mar 21 11:13:39 2007 @@ -1,11 +1,14 @@ BASE=../../../.. XMLRPC_DIR=$(BASE)/libs/xmlrpc-c -XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la $(XMLRPC_DIR)/src/libxmlrpc_server.la +#XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la +#dont ask... +XMLRPCLAS = $(XMLRPC_DIR)/src/*.o +XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.la XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.la $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.la XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la -LOCAL_LDFLAGS = $(XMLRPCLAS) +LOCAL_OBJS =$(XMLRPCLAS) LOCAL_CFLAGS=-I$(XMLRPC_DIR)/include include $(BASE)/build/modmake.rules

1 0

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

21 Mar '07

Author: brian Date: Wed Mar 21 00:11:30 2007 New Revision: 4712 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Log: tweak Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Wed Mar 21 00:11:30 2007 @@ -1,4 +1,4 @@ BASE=../../../.. -LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg729; then echo "-I$(PREFIX)/include/libg729" ; else echo "-DG729_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg729 || echo "-lg729" +LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/g729; then echo "-I$(PREFIX)/include/g729" ; else echo "-DG729_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/g729 || echo "-L/usr/local/freeswitchlib -lg729" include $(BASE)/build/modmake.rules

1 0

[commit] r4711 - freeswitch/trunk/src/mod/codecs/mod_g723_1
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: brian Date: Wed Mar 21 00:09:49 2007 New Revision: 4711 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Log: small tweak Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Wed Mar 21 00:09:49 2007 @@ -1,6 +1,6 @@ BASE=../../../.. -LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg723_1; then echo "-I$(PREFIX)/include/g723" ; else echo "-DG723_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg723_1 || echo "-lg723" +LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg723_1; then echo "-I$(PREFIX)/include" ; else echo "-DG723_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg723_1 || echo "-L/usr/local/freeswitch/lib -lg723" include $(BASE)/build/modmake.rules

1 0

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

21 Mar '07

Author: mikej Date: Tue Mar 20 22:48:47 2007 New Revision: 4706 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: msvc build tweaks 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 Tue Mar 20 22:48:47 2007 @@ -4805,7 +4805,7 @@ case 200: if (sip && sip->sip_contact && sip->sip_contact->m_expires) { char *new_expires = (char *) sip->sip_contact->m_expires; - int expi = atoi(new_expires); + uint32_t expi = (uint32_t)atoi(new_expires); if (expi != sofia_private->gateway->freq) { sofia_private->gateway->freq = expi; @@ -5569,10 +5569,6 @@ } if ((gateway = switch_core_alloc(profile->pool, sizeof(*gateway)))) { - gateway->pool = profile->pool; - gateway->profile = profile; - gateway->name = switch_core_strdup(gateway->pool, name); - gateway->freq = 0; char *scheme = "Digest", *realm = NULL, *username = NULL, @@ -5581,6 +5577,11 @@ *proxy = NULL, *context = "default", *expire_seconds = "3600"; + + gateway->pool = profile->pool; + gateway->profile = profile; + gateway->name = switch_core_strdup(gateway->pool, name); + gateway->freq = 0; for (param = switch_xml_child(gateway_tag, "param"); param; param = param->next) {

1 0

[commit] r4705 - freeswitch/trunk/conf
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: brian Date: Tue Mar 20 22:47:58 2007 New Revision: 4705 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: lets not have a register in the default config \;) Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Tue Mar 20 22:47:58 2007 @@ -3,20 +3,20 @@ <profile name="$${domain}">  <gateways> - <gateway name="asterlink.com"> +   - <param name="username" value="cluecon"/> +     - <param name="password" value="2007"/> +       - <param name="expire-seconds" value="60"/> - </gateway> +  +  </gateways> <settings> <param name="debug" value="1"/>

1 0

[commit] r4704 - freeswitch/trunk/libs/pcre
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: mikej Date: Tue Mar 20 19:29:41 2007 New Revision: 4704 Modified: freeswitch/trunk/libs/pcre/configure.ac Log: correct which files are autogenerated by autoheader and which are not (continued) Modified: freeswitch/trunk/libs/pcre/configure.ac ============================================================================== --- freeswitch/trunk/libs/pcre/configure.ac (original) +++ freeswitch/trunk/libs/pcre/configure.ac Tue Mar 20 19:29:41 2007 @@ -16,6 +16,10 @@ AC_PREREQ(2.57) +dnl Arrange to build config.h from config.h.in. +dnl Manual says this macro should come right after AC_INIT. +AC_CONFIG_HEADER(config.h) + dnl Default values for miscellaneous macros POSIX_MALLOC_THRESHOLD=-DPOSIX_MALLOC_THRESHOLD=10 @@ -295,4 +299,4 @@ fi dnl This must be last; it determines what files are written as well as config.h -AC_OUTPUT(config.h Makefile pcre-config:pcre-config.in libpcre.pc:libpcre.pc.in pcrecpparg.h:pcrecpparg.h.in pcre_stringpiece.h:pcre_stringpiece.h.in RunGrepTest:RunGrepTest.in RunTest:RunTest.in,[chmod a+x RunTest RunGrepTest pcre-config]) +AC_OUTPUT(Makefile pcre-config:pcre-config.in libpcre.pc:libpcre.pc.in pcrecpparg.h:pcrecpparg.h.in pcre_stringpiece.h:pcre_stringpiece.h.in RunGrepTest:RunGrepTest.in RunTest:RunTest.in,[chmod a+x RunTest RunGrepTest pcre-config])

1 0

[commit] r4703 - in freeswitch/trunk/src/mod: codecs/mod_g722 endpoints/mod_sofia
by Freeswitch SVN 20 Mar '07

20 Mar '07

Author: anthm Date: Tue Mar 20 19:11:20 2007 New Revision: 4703 Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: rfc3551 sucks 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 Tue Mar 20 19:11:20 2007 @@ -122,8 +122,8 @@ static const switch_codec_implementation_t g722_8k_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, - /*.ianacode */ 9, - /*.iananame */ "G722", + /*.ianacode */ 109, + /*.iananame */ "G722_8", /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 64000, 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 Tue Mar 20 19:11:20 2007 @@ -811,13 +811,20 @@ int i; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; + uint32_t rfc_3551_sucks = imp->samples_per_second; + 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); } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, imp->samples_per_second); + + if (rfc_3551_sucks && imp->ianacode == 9) { + rfc_3551_sucks = 8000; + } + + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rfc_3551_sucks); if (imp->fmtp) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); }

1 0