- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10853 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: gmaruzz Date: Wed Dec 17 12:21:26 2008 New Revision: 10853 Log: re-beginning native rate Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Wed Dec 17 12:21:26 2008 @@ -107,7 +107,7 @@ p->tech_pvt = tech_pvt; } - if (skypiax_codec(tech_pvt, 16000, 20) != SWITCH_STATUS_SUCCESS) { + if (skypiax_codec(tech_pvt, SAMPLERATE, 20) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec FAILED\n"); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "skypiax_codec SUCCESS\n"); @@ -390,10 +390,9 @@ } #endif - sent = frame->datalen/sizeof(short); - //ERRORA("CLI to be sent %d\n", SKYPIAX_P_LOG, sent); + sent = frame->datalen; switch_file_write(p->audioskypepipe[1], (short *) frame->data, &sent); - //ERRORA("CLI sent %d\n", SKYPIAX_P_LOG, sent); + //ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Wed Dec 17 12:21:26 2008 @@ -45,6 +45,8 @@ //FIXME include? #endif //WIN32 +#define SAMPLES_PER_FRAME 160 +#define SAMPLERATE 8000 //#define SKYPIAX_SVN_VERSION "SVN 123456" #define SKYPIAX_SVN_VERSION SWITCH_VERSION_REVISION @@ -179,7 +181,7 @@ switch_thread_t *tcp_cli_thread; switch_thread_t *skypiax_do_controldev_thread_thread; switch_thread_t *skypiax_do_skype_thread_thread; - short audiobuf[160]; + short audiobuf[SAMPLES_PER_FRAME]; int audiobuf_is_loaded; //int phonebook_listing; Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Wed Dec 17 12:21:26 2008 @@ -37,13 +37,12 @@ /**********************************************************/ /**********************************************************/ /**********************************************************/ -#define SAMPLES_PER_FRAME 320 static void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, void *obj) { struct skypiax_interface *p = obj; - //short srv_out[SAMPLES_PER_FRAME / 2]; + short srv_out[SAMPLES_PER_FRAME / 2]; int s; #ifdef WIN32 unsigned int len; @@ -53,10 +52,10 @@ int sin_size; unsigned int fd; #else - int len = 0; - //int i; - //int a; - short srv_in[SAMPLES_PER_FRAME * 2]; + int len; + int i; + int a; + short srv_in[SAMPLES_PER_FRAME]; unsigned int sin_size; int fd; #endif /* WIN32 */ @@ -64,9 +63,7 @@ struct sockaddr_in remote_addr; int exit = 0; unsigned int kill_cli_size; - short kill_cli_buff[320]; - //int i; - //int a; + short kill_cli_buff[SAMPLES_PER_FRAME * sizeof(short)]; if (option_debug > 10) { WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -120,61 +117,16 @@ fdselect = fd; FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 100000; + to.tv_usec = 10000; to.tv_sec = 0; rt = select(fdselect + 1, &fs, NULL, NULL, &to); - //switch_sleep(10000); + //usleep(1000); //rt=1; if (rt > 0) { - len = recv(fd, srv_in, SAMPLES_PER_FRAME * sizeof(short), 0); + len = recv(fd, srv_in, sizeof(short) * SAMPLES_PER_FRAME, 0); //DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); if (len > 0) { - if(len == SAMPLES_PER_FRAME * sizeof(short)) { - unsigned int howmany; - - howmany = len / sizeof(short); - switch_file_write(p->audiopipe[1], srv_in, &howmany); - if(howmany == 320){ - NOTICA("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, len / sizeof(short), howmany); - } else { - ERRORA("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, len / sizeof(short), howmany); - switch_sleep(1000); - } - } else { - - if (!p->audiobuf_is_loaded) { - for (i = 0; i < (len / sizeof(short)); i++) { - p->audiobuf[i] = srv_in[i]; - } - p->audiobuf_is_loaded = 1; - } else { - unsigned int howmany; - short totalbuf[SAMPLES_PER_FRAME]; - - howmany = len / 2 ; - for (i = 0; i < howmany; i++) - totalbuf[i] = p->audiobuf[i]; - - howmany = len / 2 ; - for (a = 0; a < howmany; a++) { - totalbuf[i] = srv_in[a]; - i++; - } - - howmany = SAMPLES_PER_FRAME; - - switch_file_write(p->audiopipe[1], totalbuf, &howmany); - p->audiobuf_is_loaded = 0; - DEBUGA_SKYPE("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, SAMPLES_PER_FRAME, howmany); - } - - - - - } - -#if 0 a = 0; for (i = 0; i < len / sizeof(short); i++) { srv_out[a] = srv_in[i]; @@ -208,7 +160,6 @@ //DEBUGA_SKYPE("read=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, (len*sizeof(short))/2, howmany); } -#endif } else if (len == 0) { DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); break; @@ -220,14 +171,14 @@ } } - kill_cli_size = 320; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audiopipe[1], kill_cli_buff, &kill_cli_size); - kill_cli_size = 320; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audioskypepipe[1], kill_cli_buff, &kill_cli_size); p->interface_state = SKYPIAX_STATE_DOWN; - kill_cli_size = 320; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audiopipe[1], kill_cli_buff, &kill_cli_size); - kill_cli_size = 320; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audioskypepipe[1], kill_cli_buff, &kill_cli_size); DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); @@ -271,9 +222,9 @@ unsigned int fd; #else int len; - //int i; - //int a; - //short cli_in[SAMPLES_PER_FRAME / 2]; + int i; + int a; + short cli_in[SAMPLES_PER_FRAME / 2]; short cli_out[SAMPLES_PER_FRAME]; unsigned int sin_size; int fd; @@ -336,17 +287,9 @@ to.tv_usec = 10000; to.tv_sec = 0; //rt = select(fdselect + 1, &fs, NULL, NULL, &to); - switch_sleep(1000); + switch_sleep(5000); rt = 1; if (rt > 0) { - //got = (SAMPLES_PER_FRAME / 2) * sizeof(short); - got = SAMPLES_PER_FRAME; - switch_file_read(p->audioskypepipe[0], cli_out, &got); - if (got > 0) { - len = send(fd, cli_out, got * sizeof(short), 0); - NOTICA("CLI=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME, got, got*sizeof(short), len); - } -#if 0 got = (SAMPLES_PER_FRAME / 2) * sizeof(short); switch_file_read(p->audioskypepipe[0], cli_in, &got); @@ -370,7 +313,6 @@ switch_sleep(1000); //ERRORA("Audio skype pipe give us: %u\n", SKYPIAX_P_LOG, got); } -#endif } } @@ -409,7 +351,7 @@ rv = switch_file_pipe_create(&p->audioskypepipe[0], &p->audioskypepipe[1], skypiax_module_pool); - rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 100000); + rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 100); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -419,7 +361,6 @@ switch_status_t skypiax_skypeaudio_read(private_t * tech_pvt) { struct skypiax_interface *p; - short buf[640]; unsigned int samples; int rt; @@ -427,26 +368,22 @@ //DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); - memset(buf, '\0', sizeof(buf)); - //switch_sleep(10000); rt = 1; if (rt > 0) { - samples = SAMPLES_PER_FRAME; + samples = SAMPLES_PER_FRAME * sizeof(short); switch_file_read(p->audiopipe[0], tech_pvt->read_frame.data, &samples); - //if ((samples = read(p->audiopipe[0], buf, SAMPLES_PER_FRAME * sizeof(short))) != 320) - if (samples != SAMPLES_PER_FRAME) { - if (samples){ - DEBUGA_SKYPE("SRV=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME); - //tech_pvt->read_frame.datalen = 0; + if (samples != SAMPLES_PER_FRAME * sizeof(short)) { + if (samples) + DEBUGA_SKYPE("read=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, + samples, SAMPLES_PER_FRAME * sizeof(short)); //do nothing - } } else { - tech_pvt->read_frame.datalen = samples * sizeof(short); - NOTICA("SRV=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); + tech_pvt->read_frame.datalen = samples; + //DEBUGA_SKYPE("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); /* A real frame */ } } else {

1 0

[commit] r10852 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: mikej Date: Wed Dec 17 12:02:46 2008 New Revision: 10852 Log: MODENDP-163 fix info dtmf support on some devices that do not send it properly Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Wed Dec 17 12:02:46 2008 @@ -3516,7 +3516,7 @@ int tmp; /* move signal_ptr where we need it (right past Signal=) */ signal_ptr = signal_ptr + 7; - if (*signal_ptr && strlen(signal_ptr) == 1 && is_dtmf(*signal_ptr)) { + if (*signal_ptr && (*signal_ptr == '*' || *signal_ptr == '#' || *signal_ptr == 'A' || *signal_ptr == 'B' || *signal_ptr == 'C' || *signal_ptr == 'D')) { dtmf.digit = *signal_ptr; } else { tmp = atoi(signal_ptr);

1 0

[commit] r10851 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: anthm Date: Wed Dec 17 10:35:40 2008 New Revision: 10851 Log: fix seg in js Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c 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 Wed Dec 17 10:35:40 2008 @@ -1778,6 +1778,8 @@ struct js_session *jss = JS_GetPrivate(cx, obj); switch_channel_t *channel; + METHOD_SANITY_CHECK(); + channel = switch_core_session_get_channel(jss->session); if (argc > 1) { @@ -1799,10 +1801,7 @@ struct js_session *jss = JS_GetPrivate(cx, obj); switch_channel_t *channel; - if (!jss || !jss->session) { - *rval = BOOLEAN_TO_JSVAL(JS_FALSE); - return JS_TRUE; - } + METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session);

1 0

[commit] r10850 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: brian Date: Wed Dec 17 10:20:32 2008 New Revision: 10850 Log: no 48k flite Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml 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 Wed Dec 17 10:20:32 2008 @@ -172,8 +172,6 @@ <param name="caller-id-name" value="$${outbound_caller_name}"/> <param name="caller-id-number" value="$${outbound_caller_id}"/> <param name="comfort-noise" value="true"/> - <param name="tts-engine" value="flite"/> - <param name="tts-voice" value="kal16"/> </profile> --> </profiles>

1 0

[commit] r10849 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: intralanman Date: Wed Dec 17 09:50:20 2008 New Revision: 10849 Log: lint Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml 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 Wed Dec 17 09:50:20 2008 @@ -172,8 +172,8 @@ <param name="caller-id-name" value="$${outbound_caller_name}"/> <param name="caller-id-number" value="$${outbound_caller_id}"/> <param name="comfort-noise" value="true"/> -  -  + <param name="tts-engine" value="flite"/> + <param name="tts-voice" value="kal16"/> </profile> --> </profiles>

1 0

[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