- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2466 - freeswitch/branches/sburrell
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: sphere Date: Wed Aug 30 21:42:48 2006 New Revision: 2466 Added: freeswitch/branches/sburrell/ Log: Creating empty folder for sburrell

1 0

[commit] r2465 - freeswitch/trunk/conf
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: mikej Date: Wed Aug 30 21:40:27 2006 New Revision: 2465 Modified: freeswitch/trunk/conf/freeswitch.xml Log: disable this for now as it acts as a catch all for bad dials. Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Aug 30 21:40:27 2006 @@ -413,10 +413,10 @@ </extension>  + you do not need any regex in the condition <extension name="999"> <condition><action application="bridge" data="exosip/888(a)66.250.68.194"/></condition> - </extension> + </extension>--> <!-- extensions starting with 4, all the numbers after 4 form a numeric filename continue=true means keep looking for more extensions to match *NOTE* The entire dialplan is parsed ONCE when the call starts

1 0

[commit] r2464 - freeswitch/trunk/conf
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: mikej Date: Wed Aug 30 21:16:37 2006 New Revision: 2464 Modified: freeswitch/trunk/conf/freeswitch.xml Log: add music test extension to the sample config. Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Aug 30 21:16:37 2006 @@ -392,6 +392,12 @@ </condition> </extension> + <extension name="testmusic"> + <condition field="destination_number" expression="^1234$"> + <action application="bridge" data="exosip/1234(a)66.250.68.194"/> + </condition> + </extension> +  <extension name="1000"> <condition field="destination_number" expression="^1000$">

1 0

[commit] r2463 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 31 Aug '06

31 Aug '06

Author: brian Date: Wed Aug 30 20:15:31 2006 New Revision: 2463 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: small tweaks Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Wed Aug 30 20:15:31 2006 @@ -62,6 +62,7 @@ struct amr_context { void *encoder_state; + void *decoder_state; int mode; }; @@ -105,13 +106,15 @@ } else { context->mode = AMR_Mode; /* start in mode 7 */ + context->encoder_state = NULL; + context->decoder_state = NULL; if (encoding) { context->encoder_state = Encoder_Interface_init(0); } if (decoding) { - Decoder_Interface_init(); + context->decoder_state = Decoder_Interface_init(); } codec->private_info = context; @@ -123,8 +126,13 @@ static switch_status_t switch_amr_destroy(switch_codec_t *codec) { struct amr_context *context = codec->private_info; - Encoder_Interface_exit(context->encoder_state); - Decoder_Interface_exit(context->encoder_state); + + if (context->encoder_state) { + Encoder_Interface_exit(context->encoder_state); + } + if (context->decoder_state) { + Decoder_Interface_exit(context->decoder_state); + } codec->private_info = NULL; return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r2462 - freeswitch/trunk/src/mod/codecs/mod_g726
by Freeswitch SVN 30 Aug '06

30 Aug '06

Author: mikej Date: Wed Aug 30 19:58:14 2006 New Revision: 2462 Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Log: tweak. still wip. 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 Wed Aug 30 19:58:14 2006 @@ -64,7 +64,7 @@ } else { g726_init_state(&handle->context); codec->private_info = handle; - handle->bits_per_frame = codec->implementation->bits_per_second / (codec->implementation->samples_per_second); + handle->bits_per_frame = (uint8_t)(codec->implementation->bits_per_second / (codec->implementation->samples_per_second)); handle->ptr = handle->buf; return SWITCH_STATUS_SUCCESS; } @@ -147,7 +147,7 @@ uint32_t new_len = 0; int16_t *ddp = decoded_data; uint8_t *edp = encoded_data; - int x; + uint32_t x; uint32_t loops = decoded_data_len / (sizeof(*ddp)); for (x = 0; x < loops && new_len < *encoded_data_len; x++) { @@ -184,7 +184,7 @@ rdata = edata; ndata = edata; - *handle->ptr += (edata << remain); + *handle->ptr += (uint8_t)(edata << remain); *handle->ptr = ndata; handle->bbits = 0;

1 0

[commit] r2461 - freeswitch/trunk/w32/Library
by Freeswitch SVN 30 Aug '06

30 Aug '06

Author: mikej Date: Wed Aug 30 19:50:49 2006 New Revision: 2461 Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: fix generation of switch_version.h after clean of core lib project. Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Aug 30 19:50:49 2006 @@ -398,7 +398,7 @@ Description="Generating switch_version.h" CommandLine="cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.in" "$(ProjectDir)..\..\src\include\switch_version.h"
" AdditionalDependencies="..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c" - Outputs="..\..\src\include\switch_version.h" + Outputs="..\..\src\include\switch_version.h;lastversion" /> </FileConfiguration> <FileConfiguration @@ -409,7 +409,7 @@ Description="Generating switch_version.h" CommandLine="cscript /nologo "$(ProjectDir)..\..\libs\win32\util.vbs" Version "$(ProjectDir)" "$(ProjectDir)..\..\" "$(ProjectDir)..\..\src\include\switch_version.h.in" "$(ProjectDir)..\..\src\include\switch_version.h"
" AdditionalDependencies="..\..\src\include\switch.h;..\..\src\include\switch_apr.h;..\..\src\include\switch_buffer.h;..\..\src\include\switch_caller.h;..\..\src\include\switch_channel.h;..\..\src\include\switch_console.h;..\..\src\include\switch_core.h;..\..\src\include\switch_event.h;..\..\src\include\switch_frame.h;..\..\src\include\switch_ivr.h;..\..\src\include\switch_loadable_module.h;..\..\src\include\switch_log.h;..\..\src\include\switch_module_interfaces.h;..\..\src\include\switch_platform.h;..\..\src\include\switch_resample.h;..\..\src\include\switch_rtp.h;..\..\src\include\switch_sqlite.h;..\..\src\include\switch_stun.h;..\..\src\include\switch_types.h;..\..\src\include\switch_utils.h;..\..\src\include\switch_xml.h;..\..\src\switch_buffer.c;..\..\src\switch_caller.c;..\..\src\switch_channel.c;..\..\src\switch_config.c;..\..\src\switch_console.c;..\..\src\switch_core.c;..\..\src\switch_event.c;..\..\src\switch_ivr.c;..\..\src\switch_loadable_module.c;..\..\src\switch_log.c;..\..\src\switch_resample.c;..\..\src\switch_rtp.c;..\..\src\switch_stun.c;..\..\src\switch_utils.c;..\..\src\switch_xml.c" - Outputs="..\..\src\include\switch_version.h" + Outputs="..\..\src\include\switch_version.h;lastversion" /> </FileConfiguration> </File>

1 0

[commit] r2460 - freeswitch/trunk/src/mod/codecs/mod_g723_1
by Freeswitch SVN 30 Aug '06

30 Aug '06

Author: brian Date: Wed Aug 30 19:23:22 2006 New Revision: 2460 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Log: clarification Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Wed Aug 30 19:23:22 2006 @@ -196,12 +196,12 @@ }; #endif static const switch_codec_interface_t g723_1_30ms_codec_interface = { - /*.interface_name */ "g723 6.3k", + /*.interface_name */ "g723.1 6.3k", /*.implementations */ &g723_1_30ms_implementation, }; #if 0 static const switch_codec_interface_t g723_1_60ms_codec_interface = { - /*.interface_name */ "g723 6.3k", + /*.interface_name */ "g723.1 6.3k", /*.implementations */ &g723_1_60ms_implementation, /*.next */ &g723_1_30ms_codec_interface };

1 0

[commit] r2459 - in freeswitch/trunk/src/mod: codecs/mod_g726 endpoints/mod_dingaling
by Freeswitch SVN 30 Aug '06

30 Aug '06

Author: anthm Date: Wed Aug 30 18:03:52 2006 New Revision: 2459 Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix some bugs and g726 wip (only 32 works so far) 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 Wed Aug 30 18:03:52 2006 @@ -159,7 +159,7 @@ //printf("new byte assign the %d bits\n", handle->bits_per_frame); *handle->ptr = edata; } else if (bits <= BITS_IN_A_BYTE) { - int shift_by = ((handle->bits_per_frame * (handle->ecount)) - handle->bits_per_frame); + int shift_by = ((handle->bits_per_frame * (handle->ecount -1))); //printf ("shift by %d and add %d bits\n", shift_by, handle->bits_per_frame); //*handle->ptr <<= shift_by; //*handle->ptr |= edata; @@ -168,8 +168,9 @@ //printf("edata\n"); //print_bits(edata); //printf("\n"); - - *handle->ptr |= (edata << 4); + + *handle->ptr <<= shift_by; + *handle->ptr |= edata; //printf("handle\n"); //print_bits(*handle->ptr); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Aug 30 18:03:52 2006 @@ -458,7 +458,10 @@ static int do_describe(struct private_object *tech_pvt, int force) { ldl_payload_t payloads[5]; - assert(switch_core_session_get_channel(tech_pvt->session) != NULL); + + if (!tech_pvt->session) { + return 0; + } if (switch_test_flag(tech_pvt, TFLAG_DO_DESC)) { return 1;

1 0

[commit] r2458 - in freeswitch/trunk/src: . mod/codecs/mod_g726
by Freeswitch SVN 30 Aug '06

30 Aug '06

Author: brian Date: Wed Aug 30 15:46:43 2006 New Revision: 2458 Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/switch_rtp.c Log: wip 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 Wed Aug 30 15:46:43 2006 @@ -80,6 +80,26 @@ typedef int (*encoder_t)(int, int, g726_state *); typedef int (*decoder_t)(int, int, g726_state *); + +static void print_bits(uint8_t byte) +{ + int i; + + for (i=7;i>=0;i--) { + //for (i=0;i<=7;i++) { + if(byte & (1 << i)) { + printf("1"); + } else { + printf("0"); + } + } +} + + + + + + static switch_status_t switch_g726_encode(switch_codec_t *codec, switch_codec_t *other_codec, void *decoded_data, @@ -132,15 +152,29 @@ for (x = 0; x < loops && new_len < *encoded_data_len; x++) { int edata = encoder(*ddp, AUDIO_ENCODING_LINEAR, context); + int bits = handle->bbits + handle->bits_per_frame; - handle->ecount++; if (!handle->bbits) { + //printf("new byte assign the %d bits\n", handle->bits_per_frame); *handle->ptr = edata; - } else if ((handle->bbits + handle->bits_per_frame) <= BITS_IN_A_BYTE) { - printf ("WTF %d\n", BITS_IN_A_BYTE - (handle->bits_per_frame * handle->ecount)); - *handle->ptr += (edata << (BITS_IN_A_BYTE - (handle->bits_per_frame * handle->ecount))); - handle->ecount = 0; + } else if (bits <= BITS_IN_A_BYTE) { + int shift_by = ((handle->bits_per_frame * (handle->ecount)) - handle->bits_per_frame); + //printf ("shift by %d and add %d bits\n", shift_by, handle->bits_per_frame); + //*handle->ptr <<= shift_by; + //*handle->ptr |= edata; + if (shift_by); + + //printf("edata\n"); + //print_bits(edata); + //printf("\n"); + + *handle->ptr |= (edata << 4); + + //printf("handle\n"); + //print_bits(*handle->ptr); + //printf("\n"); + } else { int remain, next, rdata, ndata; @@ -155,9 +189,17 @@ handle->bbits = 0; handle->ecount = 0; } - handle->bits += handle->bits_per_frame; + handle->bits = bits; handle->bbits += handle->bits_per_frame; + if (0) { + for(x = 0; x < 5; x++) { + print_bits(handle->buf[x]); + printf(" "); + } + printf("\n"); + } + if ((handle->bits % BITS_IN_A_BYTE) == 0) { int bytes = handle->bits / BITS_IN_A_BYTE, count; for(count = 0; count < bytes; count++) { @@ -165,6 +207,7 @@ } handle->bits = handle->bbits = 0; handle->ptr = handle->buf; + handle->ecount = 0; memset(handle->buf, 0, sizeof(handle->buf)); } ddp++; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Aug 30 15:46:43 2006 @@ -317,8 +317,7 @@ } if (rtp_session->sock) { - switch_socket_close(rtp_session->sock); - rtp_session->sock = NULL; + switch_rtp_kill_socket(rtp_session); } if (switch_socket_create(&rtp_session->sock, AF_INET, SOCK_DGRAM, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS) { @@ -541,8 +540,10 @@ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session) { + switch_mutex_lock(rtp_session->flag_mutex); apr_socket_shutdown(rtp_session->sock, APR_SHUTDOWN_READWRITE); - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_IO); + switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO); + switch_mutex_unlock(rtp_session->flag_mutex); } SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session) @@ -557,8 +558,11 @@ return; } + switch_mutex_lock((*rtp_session)->flag_mutex); switch_rtp_kill_socket(*rtp_session); switch_socket_close((*rtp_session)->sock); + (*rtp_session)->sock = NULL; + switch_mutex_unlock((*rtp_session)->flag_mutex); if (switch_test_flag((*rtp_session), SWITCH_RTP_FLAG_VAD)) { switch_rtp_disable_vad(*rtp_session);

1 0

[commit] r2457 - freeswitch/trunk/libs/codec/lpc10
by Freeswitch SVN 30 Aug '06

30 Aug '06

Author: anthm Date: Wed Aug 30 15:20:44 2006 New Revision: 2457 Removed: freeswitch/trunk/libs/codec/lpc10/Makefile Log:

1 0