- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7474 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: mikej Date: Fri Feb 1 16:19:33 2008 New Revision: 7474 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: add setGlobalVariable to spidermonkey (FSCORE-94), Thanks Anthony 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 Fri Feb 1 16:19:33 2008 @@ -3054,9 +3054,21 @@ return JS_FALSE; } +static JSBool js_global_set(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + char *var_name = NULL, *val = NULL; + if (argc > 1) { + var_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + val = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + switch_core_set_variable(var_name, val); + return JS_TRUE; + } + /* this is so the wrong error message to throw for this one */ + eval_some_js("~throw new Error(\"var name not supplied!\");", cx, obj, rval); + return JS_FALSE; +} - -static JSBool js_global(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +static JSBool js_global_get(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { char *var_name = NULL, *val = NULL; @@ -3247,7 +3259,8 @@ static JSFunctionSpec fs_functions[] = { {"console_log", js_log, 2}, {"consoleLog", js_log, 2}, - {"getGlobalVariable", js_global, 2}, + {"getGlobalVariable", js_global_get, 2}, + {"setGlobalVariable", js_global_set, 2}, {"exit", js_exit, 0}, {"include", js_include, 1}, {"bridge", js_bridge, 2},

1 0

[commit] r7473 - in freeswitch/trunk: conf/autoload_configs src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: mikej Date: Fri Feb 1 16:14:53 2008 New Revision: 7473 Modified: freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: option to disable 100 continue (MDXMLINT-24), Thanks Shannon. Modified: freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml Fri Feb 1 16:14:53 2008 @@ -23,6 +23,9 @@  <param name="encode" value="true"/> + +  +    Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Fri Feb 1 16:14:53 2008 @@ -45,6 +45,7 @@ uint32_t ignore_cacert_check; int encode; int log_b; + int disable100continue; } globals; SWITCH_MODULE_LOAD_FUNCTION(mod_xml_cdr_load); @@ -121,6 +122,7 @@ /* try to post it to the web server */ if (!switch_strlen_zero(globals.url)) { struct curl_slist *headers = NULL; + struct curl_slist *slist = NULL; curl_handle = curl_easy_init(); if (globals.encode) { @@ -158,6 +160,11 @@ curl_easy_setopt(curl_handle, CURLOPT_URL, globals.url); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, httpCallBack); + + if (globals.disable100continue) { + slist = curl_slist_append(slist, "Expect:"); + curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); + } if (globals.ignore_cacert_check) { curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, FALSE); @@ -245,6 +252,7 @@ memset(&globals,0,sizeof(globals)); globals.log_b = 1; + globals.disable100continue = 0; /* parse the config */ if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { @@ -265,6 +273,8 @@ globals.delay = (uint32_t) atoi(val); } else if (!strcasecmp(var, "log-b-leg")) { globals.log_b = switch_true(val); + } else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) { + globals.disable100continue = 1; } else if (!strcasecmp(var, "encode")) { if (!strcasecmp(val, "base64")) { globals.encode = 2;

1 0

[commit] r7472 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: mikej Date: Fri Feb 1 14:57:34 2008 New Revision: 7472 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: tweak display name from different headers (SFSIP-47) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Feb 1 14:57:34 2008 @@ -2375,7 +2375,7 @@ if (rpid->rpid_url && rpid->rpid_url->url_user) { from_user = rpid->rpid_url->url_user; } - if (rpid->rpid_display) { + if (!switch_strlen_zero(rpid->rpid_display)) { displayname = rpid->rpid_display; } } @@ -2384,7 +2384,7 @@ if (passerted->paid_url && passerted->paid_url->url_user) { from_user = passerted->paid_url->url_user; } - if (passerted->paid_display) { + if (!switch_strlen_zero(passerted->paid_display)) { displayname = passerted->paid_display; } } @@ -2393,7 +2393,7 @@ if (ppreferred->ppid_url && ppreferred->ppid_url->url_user) { from_user = ppreferred->ppid_url->url_user; } - if (ppreferred->ppid_display) { + if (!switch_strlen_zero(ppreferred->ppid_display)) { displayname = ppreferred->ppid_display; } }

1 0

[commit] r7471 - in freeswitch/trunk: . src/mod/codecs/mod_g726
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: mikej Date: Fri Feb 1 14:50:09 2008 New Revision: 7471 Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.2008.vcproj Log: move g726 build to use new lib. Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri Feb 1 14:50:09 2008 @@ -634,11 +634,9 @@ {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg726", "libs\codec\g726\libg726.2008.vcproj", "{5A6A281A-AA50-470A-8305-202BDA1CD1BF}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.2008.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" ProjectSection(ProjectDependencies) = postProject - {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF} + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection @@ -1206,12 +1204,6 @@ {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.ActiveCfg = Debug|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.Build.0 = Debug|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|x64.ActiveCfg = Debug|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|Win32.ActiveCfg = Release|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|Win32.Build.0 = Release|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|x64.ActiveCfg = Release|Win32 {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.ActiveCfg = Debug|Win32 {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.Build.0 = Debug|Win32 {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1556,7 +1548,6 @@ {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.2008.vcproj Fri Feb 1 14:50:09 2008 @@ -39,7 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g726\src"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" UsePrecompiledHeader="0" /> <Tool @@ -102,7 +102,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g726\src"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" UsePrecompiledHeader="0" /> <Tool

1 0

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

01 Feb '08

Author: brian Date: Fri Feb 1 14:48:24 2008 New Revision: 7470 Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c Log: fix Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c Fri Feb 1 14:48:24 2008 @@ -79,15 +79,17 @@ switch_codec_interface_t *codec_interface; /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_CODEC(codec_interface, "H.26x Video (passthru)"); + SWITCH_ADD_CODEC(codec_interface, "H.264 Video (passthru)"); switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_VIDEO, 99, "H264", NULL, 90000, 90000, 0, 0, 0, 0, 0, 1, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); + SWITCH_ADD_CODEC(codec_interface, "H.263 Video (passthru)"); switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_VIDEO, 34, "H263", NULL, 90000, 90000, 0, 0, 0, 0, 0, 1, 1, 1, switch_h26x_init, switch_h26x_encode, switch_h26x_decode, switch_h26x_destroy); + SWITCH_ADD_CODEC(codec_interface, "H.261 Video (passthru)"); switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_VIDEO, 31, "H261", NULL, 90000, 90000, 0, 0, 0, 0, 0, 1, 1, 1,

1 0

[commit] r7469 - in freeswitch/trunk/src/mod/codecs: mod_l16 mod_speex
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: mikej Date: Fri Feb 1 14:43:06 2008 New Revision: 7469 Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Log: use right type. Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Fri Feb 1 14:43:06 2008 @@ -91,7 +91,7 @@ { switch_codec_interface_t *codec_interface; int mpf = 10000, spf = 80, bpf = 160, ebpf = 160, bps = 128000, rate = 8000, counta, countb; - int ianacode[4] = { 0, 10, 117, 119 }; + switch_payload_t ianacode[4] = { 0, 10, 117, 119 }; /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Fri Feb 1 14:43:06 2008 @@ -265,7 +265,7 @@ { switch_codec_interface_t *codec_interface; int mpf = 10000, spf = 80, bpf = 160, ebpf = 0, rate = 8000, counta, countb; - int ianacode[4] = { 0, 98, 99, 103}; + switch_payload_t ianacode[4] = { 0, 98, 99, 103}; int bps[4] = { 0, 24600, 42200, 44000 }; /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname);

1 0

[commit] r7468 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: brian Date: Fri Feb 1 14:36:57 2008 New Revision: 7468 Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Log: SIPPhone has now fixed their TCP SRV record so it will work great.. just don't send it an SRTP key it'll barf Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Fri Feb 1 14:36:57 2008 @@ -1,7 +1,8 @@ <include> <extension name="sipphone.com"> <condition field="destination_number" expression="^((1222.*)$|^(1747.*))$"> - <action application="bridge" data="sofia/gateway/proxy01.sipphone.com/$1;transport=udp"/> + <action application="unset" data="sip_secure_media"/> + <action application="bridge" data="sofia/gateway/proxy01.sipphone.com/$1"/> </condition> </extension> </include>

1 0

[commit] r7467 - in freeswitch/trunk/src: . include/private
by Freeswitch SVN 01 Feb '08

01 Feb '08

Author: mikej Date: Fri Feb 1 14:20:22 2008 New Revision: 7467 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/switch_core_media_bug.c Log: stuff buffers into the bug to reduce stack allocation Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Fri Feb 1 14:20:22 2008 @@ -152,6 +152,8 @@ void *user_data; uint32_t flags; uint8_t ready; + uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; + int16_t tmp[SWITCH_RECOMMENDED_BUFFER_SIZE]; time_t stop_time; switch_thread_id_t thread_id; struct switch_media_bug *next; Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Fri Feb 1 14:20:22 2008 @@ -79,7 +79,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame) { uint32_t bytes = 0; - uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 }; uint32_t datalen = 0; int16_t *dp, *fp; uint32_t x; @@ -102,7 +101,7 @@ return SWITCH_STATUS_FALSE; } - maxlen = sizeof(data) > frame->buflen ? frame->buflen : sizeof(data); + maxlen = SWITCH_RECOMMENDED_BUFFER_SIZE > frame->buflen ? frame->buflen : SWITCH_RECOMMENDED_BUFFER_SIZE; if ((rdlen = rlen > wlen ? wlen : rlen) > maxlen) { rdlen = maxlen; @@ -123,7 +122,7 @@ if (wlen) { switch_mutex_lock(bug->write_mutex); - datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, data, rdlen); + datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, rdlen); switch_mutex_unlock(bug->write_mutex); } @@ -132,9 +131,9 @@ switch_assert( bytes <= maxlen ); if (bytes) { - int16_t tmp[SWITCH_RECOMMENDED_BUFFER_SIZE], *tp = tmp; + int16_t *tp = bug->tmp; - dp = (int16_t *) data; + dp = (int16_t *) bug->data; fp = (int16_t *) frame->data; rlen = frame->datalen / 2; wlen = datalen / 2; @@ -153,7 +152,7 @@ *(tp++) = 0; } } - memcpy(frame->data, tmp, bytes * 2); + memcpy(frame->data, bug->tmp, bytes * 2); } else { for (x = 0; x < blen; x++) { int32_t z = 0;

1 0

[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