December 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10848 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: anthm Date: Wed Dec 17 09:21:53 2008 New Revision: 10848 Log: allow conf command from dp Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 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 Dec 17 09:21:53 2008 @@ -3729,10 +3729,6 @@ cmd = "help"; } - if (session) { - return SWITCH_STATUS_FALSE; - } - if (stream->param_event) { http = switch_event_get_header(stream->param_event, "http-host"); }

1 0

[commit] r10847 - freeswitch/branches/cseket/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: cseket Date: Wed Dec 17 05:17:07 2008 New Revision: 10847 Log: MODAPP-177 Modified: freeswitch/branches/cseket/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/branches/cseket/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/branches/cseket/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/branches/cseket/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Dec 17 05:17:07 2008 @@ -51,7 +51,7 @@ static switch_status_t voicemail_inject(const char *data); -const char *global_cf = "voicemail.conf"; +static const char *global_cf = "voicemail.conf"; static struct { switch_hash_t *profile_hash; int debug; @@ -273,7 +273,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf); return profile; } - if (!(x_profiles = switch_xml_child(cfg, "profiles"))) { goto end; } @@ -1666,12 +1665,11 @@ #define FREE_DOMAIN_ROOT() if (x_domain_root) switch_xml_free(x_domain_root); x_user = x_domain = x_domain_root = NULL -static void voicemail_check_main(switch_core_session_t *session, const char *profile_name, const char *domain_name, const char *id, int auth) +static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *profile, const char *domain_name, const char *id, int auth) { vm_check_state_t vm_check_state = VM_CHECK_START; switch_channel_t *channel = switch_core_session_get_channel(session); switch_caller_profile_t *caller_profile = switch_channel_get_caller_profile(channel); - vm_profile_t *profile; switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params, x_param; switch_status_t status; char pass_buf[80] = "", *mypass = NULL, id_buf[80] = "", *myfolder = NULL; @@ -1692,7 +1690,7 @@ switch_input_args_t args = { 0 }; const char *caller_id_name = NULL; const char *caller_id_number = NULL; - + if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) { caller_id_name = caller_profile->caller_id_name; } @@ -1701,11 +1699,6 @@ caller_id_number = caller_profile->caller_id_number; } - if (!(profile = get_profile(profile_name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); - return; - } - timeout = profile->digit_timeout; attempts = profile->max_login_attempts; status = switch_ivr_phrase_macro(session, VM_HELLO_MACRO, NULL, NULL, &args); @@ -2216,8 +2209,6 @@ end: - switch_thread_rwlock_unlock(profile->rwlock); - if (switch_channel_ready(channel)) { if (failed) { status = switch_ivr_phrase_macro(session, VM_ABORT_MACRO, NULL, NULL, NULL); @@ -2681,12 +2672,11 @@ return status; } -static switch_status_t voicemail_leave_main(switch_core_session_t *session, const char *profile_name, const char *domain_name, const char *id) +static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_profile_t *profile, const char *domain_name, const char *id) { switch_channel_t *channel = switch_core_session_get_channel(session); char sql[256]; prefs_callback_t cbt; - vm_profile_t *profile; char *uuid = switch_core_session_get_uuid(session); char *file_path = NULL; char *dir_path = NULL; @@ -2732,11 +2722,6 @@ memset(&cbt, 0, sizeof(cbt)); - if (!(profile = get_profile(profile_name))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); - return SWITCH_STATUS_FALSE;; - } - if (id) { int ok = 1; switch_event_t *params = NULL; @@ -2875,7 +2860,7 @@ if (*buf != '\0') { greet_key_press: if (!strcasecmp(buf, profile->main_menu_key)) { - voicemail_check_main(session, profile_name, domain_name, id, 0); + voicemail_check_main(session, profile, domain_name, id, 0); } else if (!strcasecmp(buf, profile->operator_key) && !switch_strlen_zero(profile->operator_key)) { int argc; char *argv[4]; @@ -2977,8 +2962,6 @@ end: - switch_thread_rwlock_unlock(profile->rwlock); - if (x_domain_root) { switch_xml_free(x_domain_root); x_domain_root = NULL; @@ -3002,6 +2985,7 @@ int argc = 0; char *argv[6] = { 0 }; char *mydata = NULL; + vm_profile_t * profile = NULL; const char *profile_name = NULL; const char *domain_name = NULL; const char *id = NULL; @@ -3059,11 +3043,19 @@ return; } + if (!(profile = get_profile(profile_name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); + return; + } + if (check) { - voicemail_check_main(session, profile_name, domain_name, id, auth); + voicemail_check_main(session, profile, domain_name, id, auth); } else { - voicemail_leave_main(session, profile_name, domain_name, id); + voicemail_leave_main(session, profile, domain_name, id); } + + switch_thread_rwlock_unlock(profile->rwlock); + } #define BOXCOUNT_SYNTAX "<user>@<domain>[|[new|saved|new-urgent|saved-urgent|all]]"

1 0

[commit] r10846 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: mikej Date: Tue Dec 16 23:29:48 2008 New Revision: 10846 Log: fix segfault on invalid usage Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Dec 16 23:29:48 2008 @@ -439,6 +439,9 @@ argv[3]); } else if (!strcasecmp(argv[0], "delete")) { sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: db %s\n", DB_USAGE); + return; } switch_assert(sql);

1 0

[commit] r10845 - freeswitch/trunk/src/mod/codecs/mod_voipcodecs
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: brian Date: Tue Dec 16 22:46:41 2008 New Revision: 10845 Log: more docs Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Tue Dec 16 22:46:41 2008 @@ -881,8 +881,23 @@ #if SWITCH_MAX_INTERVAL >= 90 SWITCH_ADD_CODEC(codec_interface, "LPC-10"); switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 7, "LPC", NULL, 8000, 8000, 2400, - 90000, 720, 1440, 28, 1, 4, switch_lpc10_init, switch_lpc10_encode, switch_lpc10_decode, switch_lpc10_destroy); + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 7, /* the IANA code number */ + "LPC", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 8000, /* samples transferred per second */ + 8000, /* actual samples transferred per second */ + 2400, /* bits transferred per second */ + 90000, /* number of microseconds per frame */ + 720, /* number of samples per frame */ + 1440, /* number of bytes per frame decompressed */ + 28, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 4, /* number of frames per network packet */ + switch_lpc10_init, /* function to initialize a codec handle using this implementation */ + switch_lpc10_encode, /* function to encode raw data into encoded data */ + switch_lpc10_decode, /* function to decode encoded data into raw data */ + switch_lpc10_destroy); /* deinitalize a codec handle using this implementation */ #endif /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r10844 - freeswitch/trunk/src/mod/codecs/mod_amr
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: brian Date: Tue Dec 16 22:42:56 2008 New Revision: 10844 Log: more codec docs Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c 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 Tue Dec 16 22:42:56 2008 @@ -320,8 +320,24 @@ SWITCH_ADD_CODEC(codec_interface, "AMR"); switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 96, "AMR", "octet-align=0", 8000, 8000, 12200, 20000, 160, 320, 0, 1, 1, - switch_amr_init, switch_amr_encode, switch_amr_decode, switch_amr_destroy); + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 96, /* the IANA code number */ + "AMR", /* the IANA code name */ + "octet-align=0", /* default fmtp to send (can be overridden by the init function) */ + 8000, /* samples transferred per second */ + 8000, /* actual samples transferred per second */ + 12200, /* bits transferred per second */ + 20000, /* number of microseconds per frame */ + 160, /* number of samples per frame */ + 320, /* number of bytes per frame decompressed */ + 0, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_amr_init, /* function to initialize a codec handle using this implementation */ + switch_amr_encode, /* function to encode raw data into encoded data */ + switch_amr_decode, /* function to decode encoded data into raw data */ + switch_amr_destroy); /* deinitalize a codec handle using this implementation */ + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10843 - freeswitch/trunk/src
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: brian Date: Tue Dec 16 22:39:09 2008 New Revision: 10843 Log: finish filling out the info for the codec stuff for reference in the future Modified: freeswitch/trunk/src/switch_pcm.c Modified: freeswitch/trunk/src/switch_pcm.c ============================================================================== --- freeswitch/trunk/src/switch_pcm.c (original) +++ freeswitch/trunk/src/switch_pcm.c Tue Dec 16 22:39:09 2008 @@ -330,15 +330,44 @@ SWITCH_ADD_CODEC(codec_interface, "PROXY VIDEO PASS-THROUGH"); switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_VIDEO, 31, "PROXY-VID", NULL, 90000, 90000, 0, - 0, 0, 0, 0, 1, 1, switch_proxy_init, switch_proxy_encode, switch_proxy_decode, switch_proxy_destroy); + SWITCH_CODEC_TYPE_VIDEO, /* enumeration defining the type of the codec */ + 31, /* the IANA code number */ + "PROXY-VID", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 90000, /* samples transferred per second */ + 90000, /* actual samples transferred per second */ + 0, /* bits transferred per second */ + 0, /* number of microseconds per frame */ + 0, /* number of samples per frame */ + 0, /* number of bytes per frame decompressed */ + 0, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_proxy_init, /* function to initialize a codec handle using this implementation */ + switch_proxy_encode, /* function to encode raw data into encoded data */ + switch_proxy_decode, /* function to encode raw data into encoded data */ + switch_proxy_destroy); /* deinitalize a codec handle using this implementation */ SWITCH_ADD_CODEC(codec_interface, "PROXY PASS-THROUGH"); switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 0, "PROXY", NULL, 8000, 8000, 0, - 20000, 160, 320, 320, 1, 1, - switch_proxy_init, switch_proxy_encode, switch_proxy_decode, switch_proxy_destroy); + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 0, /* the IANA code number */ + "PROXY", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 8000, /* samples transferred per second */ + 8000, /* actual samples transferred per second */ + 0, /* bits transferred per second */ + 20000, /* number of microseconds per frame */ + 160, /* number of samples per frame */ + 320, /* number of bytes per frame decompressed */ + 320, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_proxy_init, /* function to initialize a codec handle using this implementation */ + switch_proxy_encode, /* function to encode raw data into encoded data */ + switch_proxy_decode, /* function to decode encoded data into raw data */ + switch_proxy_destroy); /* deinitalize a codec handle using this implementation */ SWITCH_ADD_CODEC(codec_interface, "RAW Signed Linear (16 bit)");

1 0

[commit] r10842 - freeswitch/trunk/build
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: anthm Date: Tue Dec 16 20:55:06 2008 New Revision: 10842 Log: add mod_celt Modified: freeswitch/trunk/build/modules.conf.in Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Tue Dec 16 20:55:06 2008 @@ -28,6 +28,7 @@ codecs/mod_ilbc codecs/mod_speex #codecs/mod_siren +#codecs/mod_celt #dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml dialplans/mod_dialplan_asterisk

1 0

[commit] r10841 - in freeswitch/trunk: conf/autoload_configs src src/include src/mod/applications/mod_conference src/mod/codecs/mod_celt src/mod/codecs/mod_voipcodecs src/mod/formats/mod_local_stream
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: anthm Date: Tue Dec 16 20:53:46 2008 New Revision: 10841 Log: add mod_celt Added: freeswitch/trunk/src/mod/codecs/mod_celt/ freeswitch/trunk/src/mod/codecs/mod_celt/Makefile freeswitch/trunk/src/mod/codecs/mod_celt/mod_celt.c Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_pcm.c freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Tue Dec 16 20:53:46 2008 @@ -150,5 +150,31 @@   </profile> +  +  + </profile> + --> </profiles> </configuration> Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Tue Dec 16 20:53:46 2008 @@ -22,5 +22,13 @@ <param name="interval" value="20"/> <param name="timer-name" value="soft"/> </directory> - +  </configuration> Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Tue Dec 16 20:53:46 2008 @@ -41,6 +41,7 @@ #ifndef SWITCH_LOADABLE_MODULE_H #define SWITCH_LOADABLE_MODULE_H +#include <switch_log.h> #include <switch.h> #include <switch_module_interfaces.h> @@ -324,44 +325,74 @@ break; \ } +static inline int switch_check_interval(uint32_t rate, uint32_t ptime) +{ + uint32_t max_ms = 0, ptime_div = 0; + + switch (rate) { + case 22050: + case 11025: + if (ptime < 120) return 1; + break; + case 48000: + max_ms = 20; + ptime_div = 2; + break; + case 32000: + case 16000: + max_ms = 60; + ptime_div = 2; + break; + case 8000: + max_ms = 120; + ptime_div = 2; + break; + } + + if (max_ms && ptime_div && (ptime <= max_ms && (ptime % ptime_div) == 0) && ((rate / 1000) * ptime) < SWITCH_RECOMMENDED_BUFFER_SIZE) { + return 1; + } + + return 0; +} - static inline void switch_core_codec_add_implementation(switch_memory_pool_t *pool, switch_codec_interface_t *codec_interface, - /*! enumeration defining the type of the codec */ - const switch_codec_type_t codec_type, - /*! the IANA code number */ - switch_payload_t ianacode, - /*! the IANA code name */ - const char *iananame, - /*! default fmtp to send (can be overridden by the init function) */ - char *fmtp, - /*! samples transferred per second */ - uint32_t samples_per_second, - /*! actual samples transferred per second for those who are not moron g722 RFC writers */ - uint32_t actual_samples_per_second, - /*! bits transferred per second */ - int bits_per_second, - /*! number of microseconds that denote one frame */ - int microseconds_per_packet, - /*! number of samples that denote one frame */ - uint32_t samples_per_packet, - /*! number of bytes that denote one frame decompressed */ - uint32_t decoded_bytes_per_packet, - /*! number of bytes that denote one frame compressed */ - uint32_t encoded_bytes_per_packet, - /*! number of channels represented */ - uint8_t number_of_channels, - /*! number of frames to send in one network packet */ - int codec_frames_per_packet, - /*! function to initialize a codec handle using this implementation */ - switch_core_codec_init_func_t init, - /*! function to encode raw data into encoded data */ - switch_core_codec_encode_func_t encode, - /*! function to decode encoded data into raw data */ - switch_core_codec_decode_func_t decode, - /*! deinitalize a codec handle using this implementation */ - switch_core_codec_destroy_func_t destroy) +static inline void switch_core_codec_add_implementation(switch_memory_pool_t *pool, switch_codec_interface_t *codec_interface, + /*! enumeration defining the type of the codec */ + const switch_codec_type_t codec_type, + /*! the IANA code number */ + switch_payload_t ianacode, + /*! the IANA code name */ + const char *iananame, + /*! default fmtp to send (can be overridden by the init function) */ + char *fmtp, + /*! samples transferred per second */ + uint32_t samples_per_second, + /*! actual samples transferred per second for those who are not moron g722 RFC writers */ + uint32_t actual_samples_per_second, + /*! bits transferred per second */ + int bits_per_second, + /*! number of microseconds that denote one frame */ + int microseconds_per_packet, + /*! number of samples that denote one frame */ + uint32_t samples_per_packet, + /*! number of bytes that denote one frame decompressed */ + uint32_t decoded_bytes_per_packet, + /*! number of bytes that denote one frame compressed */ + uint32_t encoded_bytes_per_packet, + /*! number of channels represented */ + uint8_t number_of_channels, + /*! number of frames to send in one network packet */ + int codec_frames_per_packet, + /*! function to initialize a codec handle using this implementation */ + switch_core_codec_init_func_t init, + /*! function to encode raw data into encoded data */ + switch_core_codec_encode_func_t encode, + /*! function to decode encoded data into raw data */ + switch_core_codec_decode_func_t decode, + /*! deinitalize a codec handle using this implementation */ + switch_core_codec_destroy_func_t destroy) { - if (codec_type == SWITCH_CODEC_TYPE_VIDEO || SWITCH_ACCEPTABLE_INTERVAL(microseconds_per_packet / 1000)) { + if (codec_type == SWITCH_CODEC_TYPE_VIDEO || switch_check_interval(actual_samples_per_second, microseconds_per_packet / 1000)) { switch_codec_implementation_t *impl = (switch_codec_implementation_t *) switch_core_alloc(pool, sizeof(*impl)); impl->codec_type = codec_type; impl->ianacode = ianacode; @@ -383,6 +414,9 @@ impl->codec_id = codec_interface->codec_id; impl->next = codec_interface->implementations; codec_interface->implementations = impl; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Rejected codec name: %s rate: %u ptime: %u\n", + iananame, actual_samples_per_second, microseconds_per_packet / 1000); } } Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Dec 16 20:53:46 2008 @@ -359,9 +359,9 @@ #define SWITCH_SYSTEM_THREAD_STACKSIZE 8192 * 1024 #define SWITCH_MAX_INTERVAL 120 /* we only do up to 120ms */ #define SWITCH_INTERVAL_PAD 10 /* A little extra buffer space to be safe */ -#define SWITCH_MAX_SAMPLE_LEN 32 +#define SWITCH_MAX_SAMPLE_LEN 48 #define SWITCH_BYTES_PER_SAMPLE 2 /* slin is 2 bytes per sample */ -#define SWITCH_RECOMMENDED_BUFFER_SIZE (SWITCH_BYTES_PER_SAMPLE * SWITCH_MAX_SAMPLE_LEN * (SWITCH_MAX_INTERVAL + SWITCH_INTERVAL_PAD)) +#define SWITCH_RECOMMENDED_BUFFER_SIZE 4096 /* worst case of 32khz @60ms we only do 48khz @10ms which is 960 */ #define SWITCH_MAX_CODECS 50 #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 Tue Dec 16 20:53:46 2008 @@ -4893,7 +4893,7 @@ if (!strcasecmp(var, "rate") && !switch_strlen_zero(val)) { uint32_t tmp = atoi(val); - if (tmp == 8000 || tmp == 16000 || tmp == 32000) { + if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 48000) { rate = tmp; } } else if (!strcasecmp(var, "domain") && !switch_strlen_zero(val)) { Added: freeswitch/trunk/src/mod/codecs/mod_celt/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_celt/Makefile Tue Dec 16 20:53:46 2008 @@ -0,0 +1,20 @@ +BASE=../../../.. + +CELT=celt-0.5.0 + +CELT_DIR=$(BASE)/libs/$(CELT) +LOCAL_CFLAGS=-I$(CELT_DIR)/libcelt +CELT_LA=$(CELT_DIR)/libcelt/.libs/libcelt.la +LOCAL_LIBADD=$(CELT_LA) +include $(BASE)/build/modmake.rules + +$(CELT_DIR): + $(GETLIB) $(CELT).tar.gz + +$(CELT_DIR)/Makefile: $(CELT_DIR) + cd $(CELT_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic + +$(CELT_LA): $(CELT_DIR)/Makefile + cd $(CELT_DIR) && $(MAKE) + $(TOUCH_TARGET) + Added: freeswitch/trunk/src/mod/codecs/mod_celt/mod_celt.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_celt/mod_celt.c Tue Dec 16 20:53:46 2008 @@ -0,0 +1,217 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Brian K. West <brian(a)freeswitch.org> + * + * mod_celt.c -- The CELT ultra-low delay audio codec (http://www.celt-codec.org/) + * + */ + +#include "switch.h" +#include "celt.h" + +SWITCH_MODULE_LOAD_FUNCTION(mod_celt_load); +SWITCH_MODULE_DEFINITION(mod_celt, mod_celt_load, NULL, NULL); + +struct celt_context { + CELTEncoder *encoder_object; + CELTDecoder *decoder_object; + CELTMode *mode_object; + int frame_size; + int bytes_per_packet; +}; + +static switch_status_t switch_celt_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + struct celt_context *context = NULL; + int encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + int decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) { + return SWITCH_STATUS_FALSE; + } + + context->mode_object = celt_mode_create(codec->implementation->actual_samples_per_second, 1, codec->implementation->samples_per_packet, NULL); + celt_mode_info(context->mode_object, CELT_GET_FRAME_SIZE, &context->frame_size); + context->bytes_per_packet = (codec->implementation->bits_per_second * context->frame_size/codec->implementation->actual_samples_per_second + 4) / 8; + + /* + if (codec->fmtp_in) { + int x, argc; + char *argv[10]; + argc = switch_separate_string(codec->fmtp_in, ';', argv, (sizeof(argv) / sizeof(argv[0]))); + for (x = 0; x < argc; x++) { + char *data = argv[x]; + char *arg; + switch_assert(data); + while (*data == ' ') { + data++; + } + if ((arg = strchr(data, '='))) { + *arg++ = '\0'; + if (!strcasecmp(data, "bitrate")) { + bit_rate = atoi(arg); + } + } + } + } + + codec->fmtp_out = switch_core_sprintf(codec->memory_pool, "bitrate=%d", bit_rate); + */ + if (encoding) { + context->encoder_object = celt_encoder_create(context->mode_object); + } + + if (decoding) { + context->decoder_object = celt_decoder_create(context->mode_object); + } + + codec->private_info = context; + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_celt_destroy(switch_codec_t *codec) +{ + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_celt_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, + unsigned int *flag) +{ + struct celt_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + *encoded_data_len = (uint32_t) celt_encode(context->encoder_object, (celt_int16_t *)decoded_data, NULL, + (unsigned char *)encoded_data, context->bytes_per_packet); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_celt_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, + unsigned int *flag) +{ + struct celt_context *context = codec->private_info; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + if (celt_decode(context->decoder_object, encoded_data, encoded_data_len, decoded_data)) { + return SWITCH_STATUS_GENERR; + } + + *decoded_data_len = codec->implementation->decoded_bytes_per_packet; + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_celt_load) +{ + switch_codec_interface_t *codec_interface; + int bytes_per_frame; + int samples_per_frame; + int ms_per_frame; + int x; + + /* 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, "CELT ultra-low delay"); + + switch_core_codec_add_implementation(pool, + codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 114, /* the IANA code number */ + "CELT", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 32000, /* samples transferred per second */ + 32000, /* actual samples transferred per second */ + 32000, /* bits transferred per second */ + 10000, /* number of microseconds per frame */ + 320, /* number of samples per frame */ + 640, /* number of bytes per frame decompressed */ + 0, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_celt_init, /* function to initialize a codec handle using this implementation */ + switch_celt_encode, /* function to encode raw data into encoded data */ + switch_celt_decode, /* function to decode encoded data into raw data */ + switch_celt_destroy); /* deinitalize a codec handle using this implementation */ + ms_per_frame = 2000; + samples_per_frame = 96; + bytes_per_frame = 192; + + for (x = 0; x < 5; x++) { + switch_core_codec_add_implementation(pool, + codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 114, /* the IANA code number */ + "CELT", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 48000, /* samples transferred per second */ + 48000, /* actual samples transferred per second */ + 48000, /* bits transferred per second */ + ms_per_frame, /* number of microseconds per frame */ + samples_per_frame, /* number of samples per frame */ + bytes_per_frame, /* number of bytes per frame decompressed */ + 0, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_celt_init, /* function to initialize a codec handle using this implementation */ + switch_celt_encode, /* function to encode raw data into encoded data */ + switch_celt_decode, /* function to decode encoded data into raw data */ + switch_celt_destroy); /* deinitalize a codec handle using this implementation */ + ms_per_frame += 2000; + samples_per_frame += 96; + bytes_per_frame += 192; + } + + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4: + */ Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Tue Dec 16 20:53:46 2008 @@ -588,7 +588,7 @@ switch_adpcm_destroy); /* deinitalize a codec handle using this implementation */ } mpf = 10000, spf = 160, bpf = 320, ebpf = 160; - for (count = 12; count > 0; count--) { + for (count = 6; count > 0; count--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ @@ -781,7 +781,7 @@ /* G722 */ mpf = 10000, spf = 80, bpf = 320, ebpf = 80; SWITCH_ADD_CODEC(codec_interface, "G.722"); - for (count = 12; count > 0; count--) { + for (count = 6; count > 0; count--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue Dec 16 20:53:46 2008 @@ -450,7 +450,7 @@ if (!strcasecmp(var, "rate")) { int tmp = atoi(val); - if (tmp == 8000 || tmp == 16000 || tmp == 32000) { + if (tmp == 8000 || tmp == 16000 || tmp == 32000 || tmp == 48000) { source->rate = tmp; } } else if (!strcasecmp(var, "shuffle")) { Modified: freeswitch/trunk/src/switch_pcm.c ============================================================================== --- freeswitch/trunk/src/switch_pcm.c (original) +++ freeswitch/trunk/src/switch_pcm.c Tue Dec 16 20:53:46 2008 @@ -323,6 +323,7 @@ switch_codec_interface_t *codec_interface; int mpf = 10000, spf = 80, bpf = 160, ebpf = 160, bps = 128000, rate = 8000, counta = 1, countb = 12; switch_payload_t ianacode[4] = { 0, 10, 117, 119 }; + int samples_per_frame, bytes_per_frame, ms_per_frame, x; /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -342,7 +343,12 @@ SWITCH_ADD_CODEC(codec_interface, "RAW Signed Linear (16 bit)"); for (counta = 1; counta <= 3; counta++) { - for (countb = 12; countb > 0; countb--) { + if (rate == 8000) { + countb = 12; + } else { + countb = 6; + } + for (; countb > 0; countb--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, ianacode[counta], "L16", NULL, rate, rate, bps, mpf * countb, spf * countb, bpf * countb, ebpf * countb, 1, spf * countb, @@ -356,13 +362,186 @@ } /* these formats below are for file playing. */ + samples_per_frame = 96; + bytes_per_frame = 192; + ms_per_frame = 2000; + + for (x = 0; x < 5; x++) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 118, /* the IANA code number */ + "L16", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 48000, /* samples transferred per second */ + 48000, /* actual samples transferred per second */ + 768000, /* bits transferred per second */ + ms_per_frame, /* number of microseconds per frame */ + samples_per_frame, /* number of samples per frame */ + bytes_per_frame, /* number of bytes per frame decompressed */ + bytes_per_frame, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_raw_init, /* function to initialize a codec handle using this implementation */ + switch_raw_encode, /* function to encode raw data into encoded data */ + switch_raw_decode, /* function to decode encoded data into raw data */ + switch_raw_destroy); /* deinitalize a codec handle using this implementation */ + + samples_per_frame += 96; + bytes_per_frame += 192; + ms_per_frame += 2000; + + } + + + samples_per_frame = 8; + bytes_per_frame = 16; + ms_per_frame = 2000; + + for (x = 0; x < 5; x++) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 10, /* the IANA code number */ + "L16", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 8000, /* samples transferred per second */ + 8000, /* actual samples transferred per second */ + 128000, /* bits transferred per second */ + ms_per_frame, /* number of microseconds per frame */ + samples_per_frame, /* number of samples per frame */ + bytes_per_frame, /* number of bytes per frame decompressed */ + bytes_per_frame, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_raw_init, /* function to initialize a codec handle using this implementation */ + switch_raw_encode, /* function to encode raw data into encoded data */ + switch_raw_decode, /* function to decode encoded data into raw data */ + switch_raw_destroy); /* deinitalize a codec handle using this implementation */ + + samples_per_frame += 8; + bytes_per_frame += 16; + ms_per_frame += 2000; + + } + + + + samples_per_frame = 16; + bytes_per_frame = 32; + ms_per_frame = 2000; + + for (x = 0; x < 5; x++) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 10, /* the IANA code number */ + "L16", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 16000, /* samples transferred per second */ + 16000, /* actual samples transferred per second */ + 256000, /* bits transferred per second */ + ms_per_frame, /* number of microseconds per frame */ + samples_per_frame, /* number of samples per frame */ + bytes_per_frame, /* number of bytes per frame decompressed */ + bytes_per_frame, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_raw_init, /* function to initialize a codec handle using this implementation */ + switch_raw_encode, /* function to encode raw data into encoded data */ + switch_raw_decode, /* function to decode encoded data into raw data */ + switch_raw_destroy); /* deinitalize a codec handle using this implementation */ + + samples_per_frame += 16; + bytes_per_frame += 32; + ms_per_frame += 2000; + + } + + + samples_per_frame = 32; + bytes_per_frame = 64; + ms_per_frame = 2000; + + for (x = 0; x < 5; x++) { + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 10, /* the IANA code number */ + "L16", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 32000, /* samples transferred per second */ + 32000, /* actual samples transferred per second */ + 512000, /* bits transferred per second */ + ms_per_frame, /* number of microseconds per frame */ + samples_per_frame, /* number of samples per frame */ + bytes_per_frame, /* number of bytes per frame decompressed */ + bytes_per_frame, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_raw_init, /* function to initialize a codec handle using this implementation */ + switch_raw_encode, /* function to encode raw data into encoded data */ + switch_raw_decode, /* function to decode encoded data into raw data */ + switch_raw_destroy); /* deinitalize a codec handle using this implementation */ + + samples_per_frame += 32; + bytes_per_frame += 64; + ms_per_frame += 2000; + + } + + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 118, /* the IANA code number */ + "L16", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 48000, /* samples transferred per second */ + 48000, /* actual samples transferred per second */ + 768000, /* bits transferred per second */ + 20000, /* number of microseconds per frame */ + 960, /* number of samples per frame */ + 1920, /* number of bytes per frame decompressed */ + 1920, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_raw_init, /* function to initialize a codec handle using this implementation */ + switch_raw_encode, /* function to encode raw data into encoded data */ + switch_raw_decode, /* function to decode encoded data into raw data */ + switch_raw_destroy); /* deinitalize a codec handle using this implementation */ + switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 118, "L16", NULL, 22050, 22050, 352800, - 20000, 441, 882, 882, 1, 1, switch_raw_init, switch_raw_encode, switch_raw_decode, switch_raw_destroy); + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 118, /* the IANA code number */ + "L16", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 22050, /* samples transferred per second */ + 22050, /* actual samples transferred per second */ + 352800, /* bits transferred per second */ + 20000, /* number of microseconds per frame */ + 441, /* number of samples per frame */ + 882, /* number of bytes per frame decompressed */ + 882, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_raw_init, /* function to initialize a codec handle using this implementation */ + switch_raw_encode, /* function to encode raw data into encoded data */ + switch_raw_decode, /* function to decode encoded data into raw data */ + switch_raw_destroy); /* deinitalize a codec handle using this implementation */ switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 118, "L16", NULL, 11025, 11025, 176400, - 40000, 441, 882, 882, 1, 1, switch_raw_init, switch_raw_encode, switch_raw_decode, switch_raw_destroy); + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 118, /* the IANA code number */ + "L16", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 11025, /* samples transferred per second */ + 11025, /* actual samples transferred per second */ + 176400, /* bits transferred per second */ + 40000, /* number of microseconds per frame */ + 441, /* number of samples per frame */ + 882, /* number of bytes per frame decompressed */ + 882, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + 1, /* number of frames per network packet */ + switch_raw_init, /* function to initialize a codec handle using this implementation */ + switch_raw_encode, /* function to encode raw data into encoded data */ + switch_raw_decode, /* function to decode encoded data into raw data */ + switch_raw_destroy); /* deinitalize a codec handle using this implementation */ Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Dec 16 20:53:46 2008 @@ -44,7 +44,9 @@ #endif #define MAX_TICK UINT32_MAX - 1024 -#define MS_PER_TICK 10 + +static int MS_PER_TICK = 10; + static switch_memory_pool_t *module_pool = NULL; static struct { @@ -252,6 +254,11 @@ private_info->start = private_info->reference = TIMER_MATRIX[timer->interval].tick; private_info->roll = TIMER_MATRIX[timer->interval].roll; private_info->ready = 1; + + if (timer->interval < MS_PER_TICK) { + MS_PER_TICK = timer->interval; + } + return SWITCH_STATUS_SUCCESS; } @@ -319,7 +326,7 @@ #endif timer_step(timer); - + while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) { check_roll(); if (globals.use_cond_yield == 1) { @@ -506,6 +513,7 @@ } #endif + if ((current_ms % MS_PER_TICK) == 0) { for (x = MS_PER_TICK; x <= MAX_ELEMENTS; x += MS_PER_TICK) { if ((current_ms % x) == 0) { @@ -525,6 +533,7 @@ } } } + if (current_ms == MAX_ELEMENTS) { current_ms = 0; }

1 0

[commit] r10840 - freeswitch/trunk/src/mod/codecs/mod_siren
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: brian Date: Tue Dec 16 18:46:49 2008 New Revision: 10840 Log: 60ms max Modified: freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.c Modified: freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.c Tue Dec 16 18:46:49 2008 @@ -147,7 +147,7 @@ SWITCH_ADD_CODEC(codec_interface, "Polycom(R) G722.1/G722.1C"); spf = 320, bpf = 640; - for (count = 4; count > 0; count--) { + for (count = 3; count > 0; count--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ @@ -169,7 +169,7 @@ switch_siren_destroy); /* deinitalize a codec handle using this implementation */ } spf = 640, bpf = 1280; - for (count = 4; count > 0; count--) { + for (count = 3; count > 0; count--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */

1 0

[commit] r10839 - freeswitch/trunk/conf/dialplan/default
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: intralanman Date: Tue Dec 16 16:54:16 2008 New Revision: 10839 Log: fix regex Modified: freeswitch/trunk/conf/dialplan/default/01_example.com.xml Modified: freeswitch/trunk/conf/dialplan/default/01_example.com.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default/01_example.com.xml (original) +++ freeswitch/trunk/conf/dialplan/default/01_example.com.xml Tue Dec 16 16:54:16 2008 @@ -20,7 +20,7 @@ <extension name="international.example.com"> <condition field="${toll_allow}" expression="international"/> - <condition field="destination_number" expression="^(011\d{10+})$"> + <condition field="destination_number" expression="^(011\d+)$"> <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/> <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>

1 0