- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3026 - in freeswitch/trunk/src/mod/applications: mod_commands mod_conference mod_dptools
by Freeswitch SVN 10 Oct '06

10 Oct '06

Author: mikej Date: Tue Oct 10 08:00:22 2006 New Revision: 3026 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: making the world a little less ugly, one commit at a time. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 10 08:00:22 2006 @@ -454,7 +454,7 @@ sprintf (sql, "select type, name from interfaces where type = '%s'", cmd); } else if (!strcmp(cmd,"application") || !strcmp(cmd,"api")) { - sprintf (sql, "select * from interfaces where type = '%s'", cmd); + sprintf (sql, "select name, description, syntax from interfaces where type = '%s'", cmd); } else if ( !strcmp(cmd,"calls")) { sprintf (sql, "select * from calls"); @@ -468,9 +468,9 @@ holder.print_title = 0; if ((cmdname = strchr(cmd, ' ')) != 0) { *cmdname++ = '\0'; - sprintf (sql, "select name, description, syntax from interfaces where type = 'api' and name = '%s'", cmdname); + sprintf (sql, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); } else { - sprintf (sql, "select name, description, syntax from interfaces where type = 'api'"); + sprintf (sql, "select name, syntax, description from interfaces where type = 'api'"); } } else { @@ -529,7 +529,7 @@ /*.interface_name */ "help", /*.desc */ "Show help for all the api commands", /*.function */ help_function, - /*.syntax */ "help", + /*.syntax */ "", /*.next */ NULL }; @@ -537,7 +537,7 @@ /*.interface_name */ "fsctl", /*.desc */ "control messages", /*.function */ ctl_function, - /*.syntax */ "fsctl [hupall|pause|resume|shutdown]", + /*.syntax */ "[hupall|pause|resume|shutdown]", /*.next */ &help_api_interface }; @@ -545,7 +545,7 @@ /*.interface_name */ "uuid_bridge", /*.desc */ "uuid_bridge", /*.function */ uuid_bridge_function, - /*.syntax */ "uuid_bridge <uuid> <other_uuid>", + /*.syntax */ "<uuid> <other_uuid>", /*.next */ &ctl_api_interface }; @@ -553,7 +553,7 @@ /*.interface_name */ "status", /*.desc */ "status", /*.function */ status_function, - /*.syntax */ "status", + /*.syntax */ "", /*.next */ &uuid_bridge_api_interface }; @@ -561,7 +561,7 @@ /*.interface_name */ "show", /*.desc */ "Show", /*.function */ show_function, - /*.syntax */ "show <blank>|codec|application|api|dialplan|file|timer|calls|channels", + /*.syntax */ "<blank>|codec|application|api|dialplan|file|timer|calls|channels", /*.next */ &status_api_interface }; @@ -569,7 +569,7 @@ /*.interface_name */ "pause", /*.desc */ "Pause", /*.function */ pause_function, - /*.syntax */ "pause <uuid> <on|off>", + /*.syntax */ "<uuid> <on|off>", /*.next */ &show_api_interface }; @@ -577,7 +577,7 @@ /*.interface_name */ "transfer", /*.desc */ "Transfer", /*.function */ transfer_function, - /*.syntax */ "transfer <uuid> <dest-exten> [<dialplan>] [<context>]", + /*.syntax */ "<uuid> <dest-exten> [<dialplan>] [<context>]", /*.next */ &pause_api_interface }; @@ -585,7 +585,7 @@ /*.interface_name */ "load", /*.desc */ "Load Module", /*.function */ load_function, - /*.syntax */ "load <mod_name>", + /*.syntax */ "<mod_name>", /*.next */ &transfer_api_interface }; @@ -593,7 +593,7 @@ /*.interface_name */ "reloadxml", /*.desc */ "Reload XML", /*.function */ reload_function, - /*.syntax */ "reloadxml", + /*.syntax */ "", /*.next */ &load_api_interface, }; @@ -602,7 +602,7 @@ /*.interface_name */ "killchan", /*.desc */ "Kill Channel", /*.function */ kill_function, - /*.syntax */ "killchan <uuid>", + /*.syntax */ "<uuid>", /*.next */ &reload_api_interface }; @@ -610,7 +610,7 @@ /*.interface_name */ "originate", /*.desc */ "Originate a Call", /*.function */ originate_function, - /*.syntax */ "originate <call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]", + /*.syntax */ "<call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]", /*.next */ &kill_api_interface }; 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 Oct 10 08:00:22 2006 @@ -2647,26 +2647,25 @@ /*.desc */ "Conference", /*.function */ conf_function, /*.syntax */ - "conference commands\n" - "conference list [delim <string>]\n" - "conference <confname> list [delim <string>]\n" - "conference <confname> energy <member_id> [<newval>]\n" - "conference <confname> volume_in <member_id> [<newval>]\n" - "conference <confname> volume_out <member_id> [<newval>]\n" - "conference <confname> play <file_path> [<member_id>]\n" - "conference <confname> say <text>\n" - "conference <confname> saymember <member_id><text>\n" - "conference <confname> stop <[current|all]> [<member_id>]\n" - "conference <confname> kick <member_id>\n" - "conference <confname> mute <member_id>\n" - "conference <confname> unmute <member_id>\n" - "conference <confname> deaf <member_id>\n" - "conference <confname> undef <member_id>\n" - "conference <confname> relate <member_id> <other_member_id> [nospeak|nohear]\n" - "conference <confname> lock\n" - "conference <confname> unlock\n" - "conference <confname> dial <endpoint_module_name>/<destination>\n" - "conference <confname> transfer <member_id> <conference_name>\n", + "list [delim <string>]\n" + "<confname> list [delim <string>]\n" + "<confname> energy <member_id> [<newval>]\n" + "<confname> volume_in <member_id> [<newval>]\n" + "<confname> volume_out <member_id> [<newval>]\n" + "<confname> play <file_path> [<member_id>]\n" + "<confname> say <text>\n" + "<confname> saymember <member_id><text>\n" + "<confname> stop <[current|all]> [<member_id>]\n" + "<confname> kick <member_id>\n" + "<confname> mute <member_id>\n" + "<confname> unmute <member_id>\n" + "<confname> deaf <member_id>\n" + "<confname> undef <member_id>\n" + "<confname> relate <member_id> <other_member_id> [nospeak|nohear]\n" + "<confname> lock\n" + "<confname> unlock\n" + "<confname> dial <endpoint_module_name>/<destination>\n" + "<confname> transfer <member_id> <conference_name>", /*.next */ }; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Oct 10 08:00:22 2006 @@ -132,7 +132,7 @@ /*.interface_name */ "strftime", /*.desc */ "strftime", /*.function */ strftime_api_function, - /*.syntax */ "strftime <format_string>", + /*.syntax */ "<format_string>", /*.next */ NULL }; @@ -140,7 +140,7 @@ /*.interface_name */ "set", /*.application_function */ set_function, /* long_desc */ "Set a channel varaible for the channel calling the application.", - /* short_desc */ "Set a channel varaible.", + /* short_desc */ "Set a channel varaible", /* syntax */ "<varname>=[<value>|_UNDEF_]", /*.next */ NULL }; @@ -149,7 +149,7 @@ /*.interface_name */ "answer", /*.application_function */ answer_function, /* long_desc */ "Answer the call for a channel.", - /* short_desc */ "Answer the call.", + /* short_desc */ "Answer the call", /* syntax */ "", /*.next */ &set_application_interface

1 0

[commit] r3025 - freeswitch/branches/leonidou
by Freeswitch SVN 10 Oct '06

10 Oct '06

Author: sphere Date: Mon Oct 9 23:49:50 2006 New Revision: 3025 Added: freeswitch/branches/leonidou/ Log: Creating empty folder for leonidou

1 0

[commit] r3024 - freeswitch/branches/john_holdsworth
by Freeswitch SVN 10 Oct '06

10 Oct '06

Author: sphere Date: Mon Oct 9 23:49:48 2006 New Revision: 3024 Added: freeswitch/branches/john_holdsworth/ Log: Creating empty folder for john_holdsworth

1 0

[commit] r3023 - freeswitch/branches/jeremy
by Freeswitch SVN 10 Oct '06

10 Oct '06

Author: sphere Date: Mon Oct 9 23:49:46 2006 New Revision: 3023 Added: freeswitch/branches/jeremy/ Log: Creating empty folder for jeremy

1 0

[commit] r3022 - freeswitch/branches/linkx
by Freeswitch SVN 10 Oct '06

10 Oct '06

Author: sphere Date: Mon Oct 9 23:49:44 2006 New Revision: 3022 Added: freeswitch/branches/linkx/ Log: Creating empty folder for linkx

1 0

[commit] r3021 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Oct '06

10 Oct '06

Author: anthm Date: Mon Oct 9 23:19:59 2006 New Revision: 3021 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Mon Oct 9 23:19:59 2006 @@ -61,6 +61,7 @@ #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" +#define SOFIA_USER_AGENT "FreeSWITCH(mod_sofia)" #include <sofia-sip/nua.h> @@ -3180,6 +3181,7 @@ NUTAG_ALLOW("REGISTER"), NUTAG_ALLOW("REFER"), SIPTAG_SUPPORTED_STR("100rel, precondition"), + SIPTAG_USER_AGENT_STR(SOFIA_USER_AGENT), TAG_END()); @@ -3191,11 +3193,13 @@ TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(node->nua, - NUTAG_EARLY_MEDIA(1), + NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), NUTAG_AUTOALERT(0), NUTAG_ALLOW("REGISTER"), + NUTAG_ALLOW("REFER"), SIPTAG_SUPPORTED_STR("100rel, precondition"), + SIPTAG_USER_AGENT_STR(SOFIA_USER_AGENT), TAG_END()); }

1 0

[commit] r3020 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 10 Oct '06

10 Oct '06

Author: anthm Date: Mon Oct 9 22:16:29 2006 New Revision: 3020 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: update 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 Mon Oct 9 22:16:29 2006 @@ -200,7 +200,7 @@ context->decoder_state = NULL; if (encoding) { - context->encoder_state = Encoder_Interface_init(0); + context->encoder_state = Encoder_Interface_init(1); } if (decoding) {

1 0

[commit] r3019 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 10 Oct '06

10 Oct '06

Author: anthm Date: Mon Oct 9 20:11:41 2006 New Revision: 3019 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: improve dingaling 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 Mon Oct 9 20:11:41 2006 @@ -68,6 +68,7 @@ TFLAG_TIMER = ( 1 << 19), TFLAG_TERM = ( 1 << 20), TFLAG_TRANSPORT_ACCEPT = (1 << 21), + TFLAG_READY = (1 << 22), } TFLAGS; typedef enum { @@ -188,31 +189,25 @@ tech_pvt = switch_core_session_get_private(*session); + if (!tech_pvt || !switch_test_flag(tech_pvt, TFLAG_READY)) { + switch_core_session_destroy(session); + return; + } - if (state < CS_INIT || !switch_core_session_running(*session)) { - if (state > CS_INIT && state < CS_HANGUP) { - channel_on_hangup(*session); - } + if (switch_test_flag(tech_pvt, TFLAG_TERM)) { + /*once is enough*/ + return; + } - if (tech_pvt && tech_pvt->dlsession) { - ldl_session_set_private(tech_pvt->dlsession, NULL); + if (tech_pvt->dlsession) { + if (!switch_test_flag(tech_pvt, TFLAG_TERM)) { + ldl_session_terminate(tech_pvt->dlsession); } - switch_core_session_destroy(session); - } else if (tech_pvt){ - if (switch_test_flag(tech_pvt, TFLAG_TERM)) { - /*once is enough*/ - return; - } - - if (tech_pvt->dlsession) { - if (!switch_test_flag(tech_pvt, TFLAG_TERM)) { - ldl_session_terminate(tech_pvt->dlsession); - } - ldl_session_destroy(&tech_pvt->dlsession); - } - switch_set_flag_locked(tech_pvt, TFLAG_TERM); + ldl_session_destroy(&tech_pvt->dlsession); } + switch_set_flag_locked(tech_pvt, TFLAG_TERM); + if (state < CS_HANGUP) { switch_channel_hangup(channel, cause); } @@ -525,22 +520,15 @@ return 1; } -static void *SWITCH_THREAD_FUNC negotiate_thread_run(switch_thread_t *thread, void *obj) +static switch_status_t negotiate_media(switch_core_session_t *session) { - switch_core_session_t *session = obj; - + switch_status_t ret = SWITCH_STATUS_FALSE; switch_channel_t *channel; struct private_object *tech_pvt = NULL; switch_time_t started; switch_time_t now; unsigned int elapsed; - if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { - /* too late */ - return NULL; - } - - tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); @@ -592,7 +580,6 @@ goto done; } switch_yield(1000); - //printf("WAIT %s %d %d %d %d\n", switch_channel_get_name(channel), switch_test_flag(tech_pvt, TFLAG_TRANSPORT), switch_test_flag(tech_pvt, TFLAG_CODEC_READY), switch_test_flag(tech_pvt, TFLAG_RTP_READY), switch_test_flag(tech_pvt, TFLAG_ANSWER)); } if (switch_channel_get_state(channel) >= CS_HANGUP || switch_test_flag(tech_pvt, TFLAG_BYE)) { @@ -608,36 +595,18 @@ goto out; } switch_channel_answer(channel); - //printf("***************************ANSWER\n"); - } else { - switch_core_session_thread_launch(session); - } - switch_channel_set_state(channel, CS_INIT); + } + ret = SWITCH_STATUS_SUCCESS; + goto done; out: terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); done: - if (session) { - switch_core_session_rwunlock(session); - } - return NULL; -} - -static void negotiate_thread_launch(switch_core_session_t *session) -{ - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; - - switch_threadattr_create(&thd_attr, switch_core_session_get_pool(session)); - switch_threadattr_detach_set(thd_attr, 1); - switch_thread_create(&thread, thd_attr, negotiate_thread_run, session, switch_core_session_get_pool(session)); - + return ret; } - - /* State methods they get called when the state changes to the specific state returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next @@ -656,9 +625,13 @@ tech_pvt->read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN; - /* Move Channel's State Machine to RING */ - switch_channel_set_state(channel, CS_RING); + switch_set_flag(tech_pvt, TFLAG_READY); + if (negotiate_media(session) == SWITCH_STATUS_SUCCESS) { + /* Move Channel's State Machine to RING */ + switch_channel_set_state(channel, CS_RING); + } + return SWITCH_STATUS_SUCCESS; } @@ -810,14 +783,11 @@ assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF [%s]\n", dtmf); - //snprintf(digits, sizeof(digits), "+%s\n", dtmf); - //ldl_handle_send_msg(tech_pvt->profile->handle, tech_pvt->recip, NULL, digits); return switch_rtp_queue_rfc2833(tech_pvt->rtp_session, dtmf, 100 * (tech_pvt->read_codec.implementation->samples_per_second / 1000)); - //return SWITCH_STATUS_SUCCESS; } static switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, @@ -887,7 +857,6 @@ tech_pvt->timestamp_recv += (int32_t) samples; tech_pvt->read_frame.samples = (int) samples; tech_pvt->last_read = tech_pvt->read_frame.datalen; - //printf("READ bytes=%d payload=%d frames=%d samples=%d ms=%d ts=%d sampcount=%d\n", (int)tech_pvt->read_frame.datalen, (int)payload, (int)frames, (int)samples, (int)ms, (int)tech_pvt->timestamp_recv, (int)tech_pvt->read_frame.samples); break; } @@ -946,15 +915,13 @@ samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; - //printf("%s send %d bytes %d samples in %d frames ts=%d\n", switch_channel_get_name(channel), frame->datalen, samples, frames, tech_pvt->timestamp_send); - if (switch_rtp_write_frame(tech_pvt->rtp_session, frame, samples) < 0) { return SWITCH_STATUS_FALSE; } tech_pvt->timestamp_send += (int) samples; switch_clear_flag_locked(tech_pvt, TFLAG_WRITING); - //switch_mutex_unlock(tech_pvt->rtp_lock); + return status; } @@ -969,11 +936,6 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - - - //if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - - //} return SWITCH_STATUS_SUCCESS; } @@ -1200,8 +1162,7 @@ terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return SWITCH_STATUS_GENERR; } - //tech_pvt->desc_id = ldl_session_describe(dlsession, NULL, 0, LDL_DESCRIPTION_INITIATE); - negotiate_thread_launch(*new_session); + switch_channel_set_state(channel, CS_INIT); return SWITCH_STATUS_SUCCESS; } @@ -1653,12 +1614,11 @@ status = LDL_STATUS_FALSE; goto done; } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating a session for %s\n", ldl_session_get_id(dlsession)); ldl_session_set_private(dlsession, session); tech_pvt->dlsession = dlsession; - negotiate_thread_launch(session); + switch_channel_set_state(channel, CS_INIT); + switch_core_session_thread_launch(session); } else { status = LDL_STATUS_FALSE; goto done;

1 0

[commit] r3018 - freeswitch/trunk/src/mod/codecs/mod_amr
by Freeswitch SVN 09 Oct '06

09 Oct '06

Author: anthm Date: Mon Oct 9 19:00:11 2006 New Revision: 3018 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Log: update 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 Mon Oct 9 19:00:11 2006 @@ -200,7 +200,7 @@ context->decoder_state = NULL; if (encoding) { - context->encoder_state = Encoder_Interface_init(1); + context->encoder_state = Encoder_Interface_init(0); } if (decoding) { @@ -268,13 +268,7 @@ return SWITCH_STATUS_FALSE; } - if (encoded_data_len == 1) { - memset(decoded_data, 255, codec->implementation->bytes_per_frame); - *flag |= SFF_CNG; - } else { - Decoder_Interface_Decode( context->decoder_state, (unsigned char *)encoded_data, (int16_t *)decoded_data, 0 ); - } - + Decoder_Interface_Decode(context->decoder_state, (unsigned char *)encoded_data, (int16_t *)decoded_data, 0); *decoded_data_len = codec->implementation->bytes_per_frame; return SWITCH_STATUS_SUCCESS;

1 0

[commit] r3017 - in freeswitch/trunk/src: . mod/codecs/mod_amr
by Freeswitch SVN 09 Oct '06

09 Oct '06

Author: anthm Date: Mon Oct 9 18:46:51 2006 New Revision: 3017 Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c freeswitch/trunk/src/switch_core.c Log: update 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 Mon Oct 9 18:46:51 2006 @@ -61,43 +61,64 @@ static const char modname[] = "mod_amr"; +typedef enum { + AMR_OPT_OCTET_ALIGN = (1 << 0), + AMR_OPT_CRC = (1 << 1), + AMR_OPT_MODE_CHANGE_NEIGHBOR = (1 << 2), + AMR_OPT_ROBUST_SORTING = (1 << 3), + AMR_OPT_INTERLEAVING = (1 << 4) +} amr_flag_t; + + +typedef enum { + GENERIC_PARAMETER_AMR_MAXAL_SDUFRAMES = 0, + GENERIC_PARAMETER_AMR_BITRATE, + GENERIC_PARAMETER_AMR_GSMAMRCOMFORTNOISE, + GENERIC_PARAMETER_AMR_GSMEFRCOMFORTNOISE, + GENERIC_PARAMETER_AMR_IS_641COMFORTNOISE, + GENERIC_PARAMETER_AMR_PDCEFRCOMFORTNOISE +} amr_param_t; + +typedef enum { + AMR_BITRATE_475 = 0, + AMR_BITRATE_515, + AMR_BITRATE_590, + AMR_BITRATE_670, + AMR_BITRATE_740, + AMR_BITRATE_795, + AMR_BITRATE_1020, + AMR_BITRATE_1220 +} amr_bitrate_t; + + struct amr_context { void *encoder_state; void *decoder_state; - int enc_mode; + switch_byte_t enc_modes; + switch_byte_t enc_mode; + uint32_t change_period; + switch_byte_t max_ptime; + switch_byte_t ptime; + switch_byte_t channels; + switch_byte_t flags; }; -enum - { - GENERIC_PARAMETER_AMR_MAXAL_SDUFRAMES = 0, - GENERIC_PARAMETER_AMR_BITRATE, - GENERIC_PARAMETER_AMR_GSMAMRCOMFORTNOISE, - GENERIC_PARAMETER_AMR_GSMEFRCOMFORTNOISE, - GENERIC_PARAMETER_AMR_IS_641COMFORTNOISE, - GENERIC_PARAMETER_AMR_PDCEFRCOMFORTNOISE - }; -enum - { - AMR_BITRATE_475 = 0, - AMR_BITRATE_515, - AMR_BITRATE_590, - AMR_BITRATE_670, - AMR_BITRATE_740, - AMR_BITRATE_795, - AMR_BITRATE_1020, - AMR_BITRATE_1220 - }; +#define AMR_DEFAULT_BITRATE AMR_BITRATE_1220 -#define AMR_Mode 7 +static struct { + switch_byte_t default_bitrate; +} globals; + static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { struct amr_context *context = NULL; int encoding, decoding; - int x, argc; + int x, i, argc; char *argv[10]; + char fmtptmp[128]; encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); decoding = (flags & SWITCH_CODEC_FLAG_DECODE); @@ -117,14 +138,64 @@ if ((arg = strchr(data, '='))) { *arg++ = '\0'; //printf("Codec arg %d [%s]=[%s]\n", x, data, arg); + if (!strcasecmp(data, "octet-align")) { + if (atoi(arg)) { + switch_set_flag(context, AMR_OPT_OCTET_ALIGN); + } + } else if (!strcasecmp(data, "mode-change-neighbor")) { + if (atoi(arg)) { + switch_set_flag(context, AMR_OPT_MODE_CHANGE_NEIGHBOR); + } + } else if (!strcasecmp(data, "crc")) { + if (atoi(arg)) { + switch_set_flag(context, AMR_OPT_CRC); + } + } else if (!strcasecmp(data, "robust-sorting")) { + if (atoi(arg)) { + switch_set_flag(context, AMR_OPT_ROBUST_SORTING); + } + } else if (!strcasecmp(data, "interveaving")) { + if (atoi(arg)) { + switch_set_flag(context, AMR_OPT_INTERLEAVING); + } + } else if (!strcasecmp(data, "mode-change-period")) { + context->change_period = atoi(arg); + } else if (!strcasecmp(data, "ptime")) { + context->ptime = atoi(arg); + } else if (!strcasecmp(data, "channels")) { + context->channels = atoi(arg); + } else if (!strcasecmp(data, "maxptime")) { + context->max_ptime = atoi(arg); + } else if (!strcasecmp(data, "mode-set")) { + int y, m_argc; + char *m_argv[7]; + m_argc = switch_separate_string(arg, ',', m_argv, (sizeof(m_argv) / sizeof(m_argv[0]))); + for(y = 0; y < m_argc; y++) { + context->enc_modes |= (1 << atoi(m_argv[y])); + } + } } } } - codec->fmtp_out = "octet-align=0; mode-set=7"; + if (context->enc_modes) { + for (i = 7; i > -1; i++) { + if (context->enc_modes & (1 << i)) { + context->enc_mode = i; + break; + } + } + } + + if (!context->enc_mode) { + context->enc_mode = globals.default_bitrate; + } - context->enc_mode = AMR_Mode; /* start in mode 7 */ + snprintf(fmtptmp, sizeof(fmtptmp), "octet-align=0; mode-set=%d", context->enc_mode); + codec->fmtp_out = switch_core_strdup(codec->memory_pool, fmtptmp); + + context->enc_mode = AMR_DEFAULT_BITRATE; context->encoder_state = NULL; context->decoder_state = NULL; @@ -174,7 +245,7 @@ return SWITCH_STATUS_FALSE; } - *encoded_data_len = Encoder_Interface_Encode( context->encoder_state, context->enc_mode, (int16_t *)decoded_data, (uint8_t *) encoded_data, 0); + *encoded_data_len = Encoder_Interface_Encode( context->encoder_state, context->enc_mode, (int16_t *)decoded_data, (switch_byte_t *) encoded_data, 0); return SWITCH_STATUS_SUCCESS; } @@ -197,9 +268,15 @@ return SWITCH_STATUS_FALSE; } - Decoder_Interface_Decode( context->decoder_state, (void *)encoded_data, (void *)decoded_data, 0 ); + if (encoded_data_len == 1) { + memset(decoded_data, 255, codec->implementation->bytes_per_frame); + *flag |= SFF_CNG; + } else { + Decoder_Interface_Decode( context->decoder_state, (unsigned char *)encoded_data, (int16_t *)decoded_data, 0 ); + } + *decoded_data_len = codec->implementation->bytes_per_frame; - //printf("D %d/%d\n", encoded_data_len, *decoded_data_len); + return SWITCH_STATUS_SUCCESS; } @@ -242,6 +319,24 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { + char *cf = "amr.conf"; + switch_xml_t cfg, xml, settings, param; + + memset(&globals, 0, sizeof(globals)); + globals.default_bitrate = AMR_DEFAULT_BITRATE; + + if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + if (!strcasecmp(var, "default-bitrate")) { + globals.default_bitrate = atoi(val); + } + } + } + } + /* connect my internal structure to the blank pointer passed to me */ *module_interface = &amr_module_interface; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Oct 9 18:46:51 2006 @@ -1570,6 +1570,7 @@ switch_io_event_hook_read_frame_t *ptr; switch_status_t status; int need_codec, perfect, do_bugs = 0; + unsigned int flag = 0; top: status = SWITCH_STATUS_FALSE; @@ -1636,7 +1637,6 @@ switch_frame_t *enc_frame, *read_frame = *frame; if (read_frame->codec) { - unsigned int flag = 0; session->raw_read_frame.datalen = session->raw_read_frame.buflen; status = switch_core_codec_decode(read_frame->codec, session->read_codec, @@ -1718,8 +1718,6 @@ } if (perfect || switch_buffer_inuse(session->raw_read_buffer) >= session->read_codec->implementation->bytes_per_frame) { - unsigned int flag = 0; - if (perfect) { enc_frame = *frame; session->raw_read_frame.rate = (*frame)->rate; @@ -1773,6 +1771,10 @@ done: if (!(*frame)) { status = SWITCH_STATUS_FALSE; + } else { + if (flag & SFF_CNG) { + switch_set_flag((*frame), SFF_CNG); + } } return status; @@ -1988,7 +1990,9 @@ write_frame = NULL; return status; } - + if (flag & SFF_CNG) { + switch_set_flag(write_frame, SFF_CNG); + } status = perform_write(session, write_frame, timeout, io_flag, stream_id); return status; } else { @@ -2062,6 +2066,9 @@ write_frame->samples = session->read_resampler->to_len; write_frame->datalen = session->read_resampler->to_len * 2; write_frame->rate = session->read_resampler->to_rate; + } + if (flag & SFF_CNG) { + switch_set_flag(write_frame, SFF_CNG); } if ((status = perform_write(session, write_frame, timeout, io_flag, stream_id)) != SWITCH_STATUS_SUCCESS) { break;

1 0