- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12353 - freeswitch/trunk/libs/libsndfile/src
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: mikej Date: Mon Mar 2 10:31:34 2009 New Revision: 12353 Log: libsndfile: add executable permissions to libs/libsndfile/src/create_symbols_file.py (FSBUILD-134) Modified: freeswitch/trunk/libs/libsndfile/src/create_symbols_file.py (props changed)

1 0

[commit] r12352 - in freeswitch/trunk/libs/spandsp: src src/spandsp test-data/etsi/fax test-data/itu/fax tests
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: mikej Date: Mon Mar 2 10:24:30 2009 New Revision: 12352 Log: update to snapshot spandsp-20090301 Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h freeswitch/trunk/libs/spandsp/src/spandsp/version.h freeswitch/trunk/libs/spandsp/src/spandsp/version.h.in freeswitch/trunk/libs/spandsp/src/t4.c freeswitch/trunk/libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c freeswitch/trunk/libs/spandsp/test-data/itu/fax/generate_sized_pages.c freeswitch/trunk/libs/spandsp/tests/t4_tests.c Modified: freeswitch/trunk/libs/spandsp/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/spandsp/src/Makefile.am (original) +++ freeswitch/trunk/libs/spandsp/src/Makefile.am Mon Mar 2 10:24:30 2009 @@ -16,7 +16,7 @@ ## License along with this program; if not, write to the Free Software ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -## $Id: Makefile.am,v 1.127 2009/02/25 15:30:21 steveu Exp $ +## $Id: Makefile.am,v 1.128 2009/03/01 12:49:28 steveu Exp $ AM_CFLAGS = $(COMP_VENDOR_CFLAGS) AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS) @@ -293,6 +293,10 @@ at_interpreter_dictionary.h: make_at_dictionary$(EXEEXT) ./make_at_dictionary$(EXEEXT) >at_interpreter_dictionary.h +t4.$(OBJEXT): spandsp/version.h + +t4.lo: spandsp/version.h + v17rx.$(OBJEXT): v17rx_fixed_rrc.h v17rx_floating_rrc.h v17rx.lo: v17rx_fixed_rrc.h v17rx_floating_rrc.h Modified: freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/bit_operations.h Mon Mar 2 10:24:30 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: bit_operations.h,v 1.25 2009/02/24 14:14:03 steveu Exp $ + * $Id: bit_operations.h,v 1.26 2009/02/26 16:08:50 steveu Exp $ */ /*! \file */ Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h Mon Mar 2 10:24:30 2009 @@ -22,7 +22,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: fast_convert.h,v 1.5 2009/02/24 14:14:03 steveu Exp $ + * $Id: fast_convert.h,v 1.6 2009/02/26 16:08:51 steveu Exp $ */ #if !defined(_SPANDSP_FAST_CONVERT_H_) Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/version.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h Mon Mar 2 10:24:30 2009 @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: version.h.in,v 1.2 2007/04/06 13:20:36 steveu Exp $ + * $Id: version.h.in,v 1.3 2009/03/01 12:39:02 steveu Exp $ */ #if !defined(_SPANDSP_VERSION_H_) @@ -30,8 +30,9 @@ /* The date and time of the version are in UTC form. */ -#define SPANDSP_RELEASE_DATE 20090226 -#define SPANDSP_RELEASE_TIME 121601 +#define SPANDSP_RELEASE_DATE 20090301 +#define SPANDSP_RELEASE_TIME 125126 +#define SPANDSP_RELEASE_DATETIME_STRING "20090301 125126" #endif /*- End of file ------------------------------------------------------------*/ Modified: freeswitch/trunk/libs/spandsp/src/spandsp/version.h.in ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/version.h.in (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/version.h.in Mon Mar 2 10:24:30 2009 @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: version.h.in,v 1.2 2007/04/06 13:20:36 steveu Exp $ + * $Id: version.h.in,v 1.3 2009/03/01 12:39:02 steveu Exp $ */ #if !defined(_SPANDSP_VERSION_H_) @@ -30,8 +30,9 @@ /* The date and time of the version are in UTC form. */ -#define SPANDSP_RELEASE_DATE $SPANDSP_RELEASE_DATE -#define SPANDSP_RELEASE_TIME $SPANDSP_RELEASE_TIME +#define SPANDSP_RELEASE_DATE $SPANDSP_RELEASE_DATE +#define SPANDSP_RELEASE_TIME $SPANDSP_RELEASE_TIME +#define SPANDSP_RELEASE_DATETIME_STRING "$SPANDSP_RELEASE_DATE $SPANDSP_RELEASE_TIME" #endif /*- End of file ------------------------------------------------------------*/ Modified: freeswitch/trunk/libs/spandsp/src/t4.c ============================================================================== --- freeswitch/trunk/libs/spandsp/src/t4.c (original) +++ freeswitch/trunk/libs/spandsp/src/t4.c Mon Mar 2 10:24:30 2009 @@ -24,7 +24,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t4.c,v 1.127 2009/02/21 04:27:46 steveu Exp $ + * $Id: t4.c,v 1.128 2009/03/01 11:47:03 steveu Exp $ */ /* @@ -86,6 +86,7 @@ #include "spandsp/bit_operations.h" #include "spandsp/async.h" #include "spandsp/t4.h" +#include "spandsp/version.h" #include "spandsp/private/logging.h" #include "spandsp/private/t4.h" @@ -205,7 +206,7 @@ TIFFSetField(t->tiff_file, TIFFTAG_RESOLUTIONUNIT, resunit); #endif /* TODO: add the version of spandsp */ - TIFFSetField(t->tiff_file, TIFFTAG_SOFTWARE, "spandsp"); + TIFFSetField(t->tiff_file, TIFFTAG_SOFTWARE, "Spandsp " SPANDSP_RELEASE_DATETIME_STRING); if (gethostname(buf, sizeof(buf)) == 0) TIFFSetField(t->tiff_file, TIFFTAG_HOSTCOMPUTER, buf); @@ -330,9 +331,11 @@ if (t->photo_metric != PHOTOMETRIC_MINISWHITE) span_log(&s->logging, SPAN_LOG_FLOW, "%s: Photometric needs swapping.\n", s->file); t->fill_order = FILLORDER_LSB2MSB; +#if 0 TIFFGetField(t->tiff_file, TIFFTAG_FILLORDER, &t->fill_order); if (t->fill_order != FILLORDER_LSB2MSB) span_log(&s->logging, SPAN_LOG_FLOW, "%s: Fill order needs swapping.\n", s->file); +#endif /* Allow a little range for the X resolution in centimeters. The spec doesn't pin down the precise value. The other value should be exact. */ Modified: freeswitch/trunk/libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c ============================================================================== --- freeswitch/trunk/libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c (original) +++ freeswitch/trunk/libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c Mon Mar 2 10:24:30 2009 @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: generate_etsi_300_242_pages.c,v 1.3 2009/02/20 12:34:20 steveu Exp $ + * $Id: generate_etsi_300_242_pages.c,v 1.4 2009/03/01 12:39:02 steveu Exp $ */ /*! \file */ @@ -177,8 +177,8 @@ }, }; -int reverse_photo_metric = FALSE; -int reverse_fill_order = FALSE; +int photo_metric = PHOTOMETRIC_MINISWHITE; +int fill_order = FILLORDER_LSB2MSB; static void clear_row(uint8_t buf[], int width) { @@ -256,13 +256,15 @@ { clear_row(image_buffer, 1728); set_pixel_range(image_buffer, 1, start_pixel, start_pixel + 63); - if (reverse_photo_metric) + if (photo_metric != PHOTOMETRIC_MINISWHITE) { for (i = 0; i < 1728/8; i++) image_buffer[i] = ~image_buffer[i]; } - if (reverse_fill_order) +#if 0 + if (fill_order != FILLORDER_LSB2MSB) bit_reverse(image_buffer, image_buffer, 1728/8); +#endif if (TIFFWriteScanline(tiff_file, image_buffer, row, 0) < 0) { printf("Write error at row %d.\n", row); @@ -558,6 +560,37 @@ float y_resolution; int i; int image_length; + int opt; + int compression; + + compression = T4_COMPRESSION_ITU_T6; + photo_metric = PHOTOMETRIC_MINISWHITE; + fill_order = FILLORDER_LSB2MSB; + while ((opt = getopt(argc, argv, "126ir")) != -1) + { + switch (opt) + { + case '1': + compression = T4_COMPRESSION_ITU_T4_1D; + break; + case '2': + compression = T4_COMPRESSION_ITU_T4_2D; + break; + case '6': + compression = T4_COMPRESSION_ITU_T6; + break; + case 'i': + photo_metric = PHOTOMETRIC_MINISBLACK; + break; + case 'r': + fill_order = FILLORDER_MSB2LSB; + break; + default: + //usage(); + exit(2); + break; + } + } tiff_file = NULL; for (i = 0; sequence[i].name; i++) @@ -582,14 +615,8 @@ TIFFSetField(tiff_file, TIFFTAG_SAMPLESPERPIXEL, 1); TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, -1L); TIFFSetField(tiff_file, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - if (reverse_photo_metric) - TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); - else - TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE); - if (reverse_fill_order) - TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB); - else - TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_LSB2MSB); + TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, photo_metric); + TIFFSetField(tiff_file, TIFFTAG_FILLORDER, fill_order); x_resolution = sequence[i].x_res/100.0f; y_resolution = sequence[i].y_res/100.0f; TIFFSetField(tiff_file, TIFFTAG_XRESOLUTION, floorf(x_resolution*2.54f + 0.5f)); Modified: freeswitch/trunk/libs/spandsp/test-data/itu/fax/generate_sized_pages.c ============================================================================== --- freeswitch/trunk/libs/spandsp/test-data/itu/fax/generate_sized_pages.c (original) +++ freeswitch/trunk/libs/spandsp/test-data/itu/fax/generate_sized_pages.c Mon Mar 2 10:24:30 2009 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: generate_sized_pages.c,v 1.2 2008/07/10 13:34:01 steveu Exp $ + * $Id: generate_sized_pages.c,v 1.3 2009/03/01 12:39:02 steveu Exp $ */ /*! \file */ @@ -289,6 +289,39 @@ float x_resolution; float y_resolution; int i; + int opt; + int compression; + int photo_metric; + int fill_order; + + compression = T4_COMPRESSION_ITU_T6; + photo_metric = PHOTOMETRIC_MINISWHITE; + fill_order = FILLORDER_LSB2MSB; + while ((opt = getopt(argc, argv, "126ir")) != -1) + { + switch (opt) + { + case '1': + compression = T4_COMPRESSION_ITU_T4_1D; + break; + case '2': + compression = T4_COMPRESSION_ITU_T4_2D; + break; + case '6': + compression = T4_COMPRESSION_ITU_T6; + break; + case 'i': + photo_metric = PHOTOMETRIC_MINISBLACK; + break; + case 'r': + fill_order = FILLORDER_MSB2LSB; + break; + default: + //usage(); + exit(2); + break; + } + } for (i = 0; sequence[i].name; i++) { @@ -296,15 +329,15 @@ exit(2); /* Prepare the directory entry fully before writing the image, or libtiff complains */ - TIFFSetField(tiff_file, TIFFTAG_COMPRESSION, COMPRESSION_CCITT_T6); + TIFFSetField(tiff_file, TIFFTAG_COMPRESSION, compression); TIFFSetField(tiff_file, TIFFTAG_IMAGEWIDTH, sequence[i].width); TIFFSetField(tiff_file, TIFFTAG_BITSPERSAMPLE, 1); TIFFSetField(tiff_file, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); TIFFSetField(tiff_file, TIFFTAG_SAMPLESPERPIXEL, 1); TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, -1L); TIFFSetField(tiff_file, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE); - TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_LSB2MSB); + TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, photo_metric); + TIFFSetField(tiff_file, TIFFTAG_FILLORDER, fill_order); x_resolution = sequence[i].x_res/100.0f; y_resolution = sequence[i].y_res/100.0f; Modified: freeswitch/trunk/libs/spandsp/tests/t4_tests.c ============================================================================== --- freeswitch/trunk/libs/spandsp/tests/t4_tests.c (original) +++ freeswitch/trunk/libs/spandsp/tests/t4_tests.c Mon Mar 2 10:24:30 2009 @@ -22,7 +22,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: t4_tests.c,v 1.67 2009/02/20 12:34:20 steveu Exp $ + * $Id: t4_tests.c,v 1.68 2009/03/01 12:39:02 steveu Exp $ */ /*! \file */ @@ -341,6 +341,17 @@ break; } } + else if (sscanf(buf, "%08x %02x %02x %02x", (unsigned int *) &bit, (unsigned int *) &bit, (unsigned int *) &bit, (unsigned int *) &bit) == 4) + { + for (i = 0; i < 16; i++) + { + if (sscanf(&buf[10 + 3*i], "%x", (unsigned int *) &bit) != 1) + break; + bit = bit_reverse8(bit); + if ((end_of_page = t4_rx_put_byte(&receive_state, bit))) + break; + } + } else if (sscanf(buf, "Rx bit %*d - %d", &bit) == 1) { if ((end_of_page = t4_rx_put_bit(&receive_state, bit)))

1 0

[commit] r12351 - freeswitch/trunk/support-d
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: mrene Date: Mon Mar 2 10:12:36 2009 New Revision: 12351 Log: Now with a document statement Modified: freeswitch/trunk/support-d/.gdbinit Modified: freeswitch/trunk/support-d/.gdbinit ============================================================================== --- freeswitch/trunk/support-d/.gdbinit (original) +++ freeswitch/trunk/support-d/.gdbinit Mon Mar 2 10:12:36 2009 @@ -49,9 +49,14 @@ end define event_dump + dont-repeat set $x = $arg0->headers while($x != 0x0) printf "%s = %s\n", $x->name, $x->value set $x = $x->next end +end +document event_dump +Usage: event_dump [switch_event_t*] +Print and event's headers and values end \ No newline at end of file

1 0

[commit] r12350 - freeswitch/trunk/support-d
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: mrene Date: Mon Mar 2 10:11:42 2009 New Revision: 12350 Log: New event_dump gdb macro Modified: freeswitch/trunk/support-d/.gdbinit Modified: freeswitch/trunk/support-d/.gdbinit ============================================================================== --- freeswitch/trunk/support-d/.gdbinit (original) +++ freeswitch/trunk/support-d/.gdbinit Mon Mar 2 10:11:42 2009 @@ -30,20 +30,6 @@ Prints the content of a hashtable displaying the key as a string and the value as pointer end -define hash_it_int - dont-repeat - set $i = 0 - set $x=$arg0->table->first - while($x != 0x0) - printf "key: %d valueptr: %p\n", $x->pKey, $x->data - set $x = $x->next - set $i = $i + 1 - end -end -document hash_it_int -Usage: hash_it_int [hashtable] -Prints the content of a hashtable displaying the key as an int and the value as pointer -end define hash_it_str_x dont-repeat @@ -62,19 +48,10 @@ Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. Args: hashtable value_type member end -define hash_it_int_x - dont-repeat - set $i = 0 - set $x=$arg0->table->first +define event_dump + set $x = $arg0->headers while($x != 0x0) - printf "key: %d\n", $x->pKey - print (($arg1*)$x->data)->$arg2 - printf "\n\n" + printf "%s = %s\n", $x->name, $x->value set $x = $x->next - set $i = $i + 1 - end -end -document hash_it_int_x -Usage: hash_it_int_x [hashtable] [value_type] [member] -Prints the content of a hashtable displaying the key as a string and a specific member of the value struct. -end + end +end \ No newline at end of file

1 0

[commit] r12349 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: anthm Date: Mon Mar 2 10:09:32 2009 New Revision: 12349 Log: MODEVENT-40 ahem `Math Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Mar 2 10:09:32 2009 @@ -1275,10 +1275,6 @@ SWITCH_STANDARD_STREAM(stream); - if (!strcasecmp(acs->api_cmd, "unload") || !strcasecmp(acs->arg, "mod_event_socket")) { - - } - if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { reply = stream.data; } else {

1 0

[commit] r12348 - freeswitch/trunk/src
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: anthm Date: Mon Mar 2 09:45:00 2009 New Revision: 12348 Log: add some more thread joins to avoid races Modified: freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Mon Mar 2 09:45:00 2009 @@ -440,11 +440,17 @@ return NULL; } +static switch_thread_t *pool_thread_p = NULL; + void switch_core_memory_stop(void) { + switch_status_t st; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping memory pool queue.\n"); #ifndef INSTANTLY_DESTROY_POOLS memory_manager.pool_thread_running = -1; + switch_thread_join(&st, pool_thread_p); + while (memory_manager.pool_thread_running) { switch_cond_next(); } @@ -454,7 +460,6 @@ switch_memory_pool_t *switch_core_memory_init(void) { #ifndef INSTANTLY_DESTROY_POOLS - switch_thread_t *thread; switch_threadattr_t *thd_attr; #endif #ifdef PER_POOL_LOCK @@ -502,7 +507,7 @@ switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, pool_thread, NULL, memory_manager.memory_pool); + switch_thread_create(&pool_thread_p, thd_attr, pool_thread, NULL, memory_manager.memory_pool); while (!memory_manager.pool_thread_running) { switch_cond_next(); Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Mar 2 09:45:00 2009 @@ -113,7 +113,7 @@ SWITCH_DECLARE(switch_time_t) switch_micro_time_now(void) { - return runtime.timestamp ? runtime.timestamp : switch_time_now(); + return (globals.RUNNING == 1 && runtime.timestamp) ? runtime.timestamp : switch_time_now(); } @@ -195,7 +195,7 @@ #ifdef DISABLE_1MS_COND do_sleep(1000); #else - if (!runtime.timestamp || globals.use_cond_yield != 1) { + if (globals.RUNNING != 1 || !runtime.timestamp || globals.use_cond_yield != 1) { do_sleep(1000); return; } @@ -210,7 +210,7 @@ switch_time_t want; if (!t) return; - if (!runtime.timestamp || globals.use_cond_yield != 1) { + if (globals.RUNNING != 1 || !runtime.timestamp || globals.use_cond_yield != 1) { do_sleep(t); return; }

1 0

[commit] r12347 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 02 Mar '09

02 Mar '09

Author: robertj Date: Sun Mar 1 21:19:57 2009 New Revision: 12347 Log: Added "jitter-size" to config file to set jitter buffer size. Fixed transmission of Q.931 Calling-Party-Number, and DisplayName on H.323 Setup. Was previously being set on the wrong connection. Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Sun Mar 1 21:19:57 2009 @@ -323,8 +323,6 @@ m_FreeSwitch->io_routines = &opalfs_io_routines; m_FreeSwitch->state_handler = &opalfs_event_handlers; - SetAudioJitterDelay(800, 3000); // should be config option - silenceDetectParams.m_mode = OpalSilenceDetector::NoSilenceDetection; if (m_listeners.empty()) { @@ -411,6 +409,15 @@ set_global_dialplan(val); } else if (!strcasecmp(var, "codec-prefs")) { set_global_codec_string(val); + } else if (!strcasecmp(var, "jitter-size")) { + char * next; + unsigned minJitter = strtoul(val, &next, 10); + if (minJitter >= 10) { + unsigned maxJitter = minJitter; + if (*next == ',') + maxJitter = atoi(next+1); + SetAudioJitterDelay(minJitter, maxJitter); // In milliseconds + } } } } @@ -455,6 +462,12 @@ } +OpalCall * FSManager::CreateCall(void * /*userData*/) +{ + return new FSCall(*this); +} + + /////////////////////////////////////////////////////////////////////// FSEndPoint::FSEndPoint(FSManager & manager) @@ -478,6 +491,32 @@ /////////////////////////////////////////////////////////////////////// +FSCall::FSCall(OpalManager & manager) + : OpalCall(manager) +{ +} + + +PBoolean FSCall::OnSetUp(OpalConnection & connection) +{ + // Transfer FS caller_id_number & caller_id_name from the FSConnection + // to the protocol connectionm (e.g. H.323) so gets sent correctly + // in outgoing packets + PSafePtr<FSConnection> local = GetConnectionAs<FSConnection>(); + if (local != NULL) { + PSafePtr<OpalConnection> proto = local->GetOtherPartyConnection(); + if (proto != NULL) { + proto->SetLocalPartyName(local->GetLocalPartyName()); + proto->SetDisplayName(local->GetDisplayName()); + } + } + + return OpalCall::OnSetUp(connection); +} + + +/////////////////////////////////////////////////////////////////////// + FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile) : OpalLocalConnection(call, endpoint, NULL) Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Sun Mar 1 21:19:57 2009 @@ -82,6 +82,14 @@ }; +class FSCall : public OpalCall { + PCLASSINFO(FSCall, OpalCall); + public: + FSCall(OpalManager & manager); + virtual PBoolean OnSetUp(OpalConnection & connection); +}; + + class FSManager : public OpalManager { PCLASSINFO(FSManager, OpalManager); @@ -96,6 +104,8 @@ return m_FreeSwitch; } + virtual OpalCall * CreateCall(void * userData); + private: switch_endpoint_interface_t *m_FreeSwitch; @@ -106,6 +116,7 @@ list < FSListener > m_listeners; }; + class FSConnection; typedef struct { switch_timer_t read_timer;

1 0

[commit] r12346 - freeswitch/trunk/debian
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: mrene Date: Sat Feb 28 16:41:28 2009 New Revision: 12346 Log: Install mod_fifo.conf.xml in autoload_configs (debian) Modified: freeswitch/trunk/debian/freeswitch.install Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Sat Feb 28 16:41:28 2009 @@ -119,5 +119,6 @@ opt/freeswitch/conf/autoload_configs/console.conf.xml opt/freeswitch/conf/autoload_configs/timezones.conf.xml opt/freeswitch/conf/autoload_configs/fax.conf.xml +opt/freeswitch/conf/autoload_configs/fifo.conf.xml opt/freeswitch/conf/jingle_profiles/server.xml opt/freeswitch/conf/jingle_profiles/client.xml

1 0

[commit] r12345 - freeswitch/trunk/scripts
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: brian Date: Sat Feb 28 14:34:23 2009 New Revision: 12345 Log: When you're down in Transylvania And the night begins to fall You might get to feeling lonely If you do give me a call Just dial Transylvania 1, 2, 3, 4, 5 Transylvania 1, 2, 3, 4, 5 Transylvania 1, 2, 3, 4, 5 (oh and remove some stuff too) /b Removed: freeswitch/trunk/scripts/mklm freeswitch/trunk/scripts/quick_lm.pl

1 0

[commit] r12344 - freeswitch/trunk/libs/esl/perl
by FreeSWITCH SVN 28 Feb '09

28 Feb '09

Author: brian Date: Sat Feb 28 10:09:38 2009 New Revision: 12344 Log: example of using esl to get events for ASR Added: freeswitch/trunk/libs/esl/perl/server3.pl Added: freeswitch/trunk/libs/esl/perl/server3.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/perl/server3.pl Sat Feb 28 10:09:38 2009 @@ -0,0 +1,61 @@ +require ESL; +use IO::Socket::INET; + +#ESL::eslSetLogLevel(7); + +my $ip = "127.0.0.1"; +my $sock = new IO::Socket::INET ( LocalHost => $ip, LocalPort => '8040', Proto => 'tcp', Listen => 1, Reuse => 1 ); +die "Could not create socket: $!\n" unless $sock; + +for(;;) { + my $new_sock = $sock->accept(); + my $pid = fork(); + if ($pid) { + close($new_sock); + next; + } + + my $host = $new_sock->sockhost(); + my $fd = fileno($new_sock); + + my $con = new ESL::ESLconnection($fd); + my $info = $con->getInfo(); + + #print $info->serialize(); + my $uuid = $info->getHeader("unique-id"); + + printf "Connected call %s, from %s\n", $uuid, $info->getHeader("caller-caller-id-number"); + + $con->sendRecv("myevents"); + $con->execute("answer"); + $con->sendRecv("divert_events on"); + $con->execute("detect_speech", "pocketsphinx yes_no yes_no"); + $con->execute("playback", "/ram/swimp.raw"); + + while($con->connected()) { + #my $e = $con->recvEventTimed(100); + my $e = $con->recvEvent(); + + if ($e) { + my $name = $e->getHeader("event-name"); + print "EVENT [$name]\n"; + if ($name eq "DETECTED_SPEECH") { + print $e->serialize(); + my $type = $e->getHeader("speech-type"); + if ($type = "detected-speech") { + $con->execute("detect_speech", "resume"); + } + } + if ($name eq "DTMF") { + my $digit = $e->getHeader("dtmf-digit"); + my $duration = $e->getHeader("dtmf-duration"); + print "DTMF digit $digit ($duration)\n"; + } + } + } + + print "BYE\n"; + close($new_sock); +} + +

1 0