- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11673 - freeswitch/branches/gmaruzz/mod_skypiax/asterisk
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: gmaruzz Date: Fri Feb 6 13:39:31 2009 New Revision: 11673 Log: skypiax: on asterisk subdir removed skypiax_protocol.c, will be a symlink to ../skypiax_protocol.c Removed: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/skypiax_protocol.c

1 0

[commit] r11672 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: gmaruzz Date: Fri Feb 6 13:36:59 2009 New Revision: 11672 Log: skypiax: if don't start all interfaces, module don't load Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c Fri Feb 6 13:36:59 2009 @@ -905,7 +905,7 @@ skypiax_skypeaudio_init(&globals.SKYPIAX_INTERFACES[interface_id]); i=0; - while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 6000) { // 60sec + while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 60000) { // 60sec FIXME switch_sleep(1000); i++; } @@ -913,7 +913,7 @@ NOTICA("STARTED interface_id=%d\n", SKYPIAX_P_LOG, interface_id); } else { ERRORA("FAILED to start interface_id=%d\n", SKYPIAX_P_LOG, interface_id); - break; + return SWITCH_STATUS_FALSE; } } else { @@ -961,7 +961,8 @@ running = 1; - load_config(); + if (load_config() != SWITCH_STATUS_SUCCESS) + return SWITCH_STATUS_FALSE; *module_interface = switch_loadable_module_create_module_interface(pool, modname); skypiax_endpoint_interface =

1 0

[commit] r11671 - in freeswitch/trunk: libs/apr libs/apr-util/xml/expat libs/libsndfile src/mod/formats/mod_shout
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 13:15:42 2009 New Revision: 11671 Log: merge parts of libtool 2.2 fixes (FSBUILD-82) Modified: freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh freeswitch/trunk/libs/apr/configure.in freeswitch/trunk/libs/libsndfile/configure.ac freeswitch/trunk/src/mod/formats/mod_shout/Makefile Modified: freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh ============================================================================== --- freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh (original) +++ freeswitch/trunk/libs/apr-util/xml/expat/buildconf.sh Fri Feb 6 13:15:42 2009 @@ -58,6 +58,8 @@ ${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" echo "Creating configure ..." +${ACLOCAL:-aclocal} + ### do some work to toss config.cache? ${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" Modified: freeswitch/trunk/libs/apr/configure.in ============================================================================== --- freeswitch/trunk/libs/apr/configure.in (original) +++ freeswitch/trunk/libs/apr/configure.in Fri Feb 6 13:15:42 2009 @@ -200,8 +200,8 @@ if test "x$use_libtool" = "xyes"; then lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' - LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" - link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${LT_VERSION} \$(ALL_LDFLAGS) -o \$@" + lt_version="-version-info `$get_version libtool $version_hdr APR`" + link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) ${lt_version} \$(ALL_LDFLAGS) -o \$@" so_ext='lo' lib_target='-rpath $(libdir) $(OBJECTS)' export_lib_target='-rpath \$(libdir) \$(OBJECTS)' Modified: freeswitch/trunk/libs/libsndfile/configure.ac ============================================================================== --- freeswitch/trunk/libs/libsndfile/configure.ac (original) +++ freeswitch/trunk/libs/libsndfile/configure.ac Fri Feb 6 13:15:42 2009 @@ -32,6 +32,7 @@ AC_PROG_CC AM_PROG_CC_C_O +AC_PROG_CXX AM_PROG_LIBTOOL AC_CHECK_PROG(autogen, autogen, yes, no) Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Fri Feb 6 13:15:42 2009 @@ -30,7 +30,7 @@ $(GETLIB) $(MPG123).tar.gz $(MPG123_DIR)/Makefile: $(MPG123_DIR) - cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS= + cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(MPG123LA): $(MPG123_DIR)/Makefile @@ -41,7 +41,7 @@ $(GETLIB) $(LAME).tar.gz $(LAME_DIR)/Makefile: $(LAME_DIR) - cd $(LAME_DIR) && ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS= + cd $(LAME_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(LAMELA): $(LAME_DIR)/Makefile @@ -52,7 +52,7 @@ $(GETLIB) $(SHOUT).tar.gz $(SHOUT_DIR)/Makefile: $(SHOUT_DIR) - cd $(SHOUT_DIR) && ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= + cd $(SHOUT_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(SHOUTLA): $(SHOUT_DIR)/Makefile

1 0

[commit] r11670 - freeswitch/trunk
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 12:46:12 2009 New Revision: 11670 Log: build: fix configure --sysconfdir (FSBUILD-84) Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Feb 6 12:46:12 2009 @@ -206,25 +206,26 @@ yaml-files: - @echo `mkdir $(DESTDIR)$(prefix)/conf/yaml 2>/dev/null` - $(INSTALL) -m 644 conf/yaml/*.yaml $(DESTDIR)$(prefix)/conf/yaml + @echo `mkdir $(DESTDIR)@confdir@/yaml 2>/dev/null` + $(INSTALL) -m 644 conf/yaml/*.yaml $(DESTDIR)@confdir@/yaml vm-sync: - test -d $(DESTDIR)$(prefix)/conf || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf - test -d $(DESTDIR)$(prefix)/conf/lang || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf/lang - test -d $(DESTDIR)$(prefix)/conf/lang/en || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf/lang/en - test -d $(DESTDIR)$(prefix)/conf/lang/en/vm || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf/lang/en/vm - $(INSTALL) -m 644 conf/lang/en/vm/* $(DESTDIR)$(prefix)/conf/lang/en/vm + test -d $(DESTDIR)@confdir@ || $(mkinstalldirs) $(DESTDIR)@confdir@ + test -d $(DESTDIR)@confdir@/lang || $(mkinstalldirs) $(DESTDIR)@confdir@/lang + test -d $(DESTDIR)@confdir@/lang/en || $(mkinstalldirs) $(DESTDIR)@confdir@/lang/en + test -d $(DESTDIR)@confdir@/lang/en/vm || $(mkinstalldirs) $(DESTDIR)@confdir@/lang/en/vm + $(INSTALL) -m 644 conf/lang/en/vm/* $(DESTDIR)@confdir@/lang/en/vm samples-conf: - test -d $(DESTDIR)$(prefix)/conf || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf + test -d $(DESTDIR)@confdir@/ || $(mkinstalldirs) $(DESTDIR)@confdir@ for conffile in `find conf -name \*.xml && find conf -name \*.conf && find conf -name \*.tpl && find conf -name \*.ttml && find conf -name mime.types` ; do \ - dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ + src_dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ + dir=`echo $$src_dir | sed -e 's|conf||'`; \ filename=`echo $$conffile | sed -e 's|^.*/||'`; \ - test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ - test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || \ - test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename.noload || \ - $(INSTALL) -m 644 $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ + test -d $(DESTDIR)@confdir@/$$dir || $(mkinstalldirs) $(DESTDIR)@confdir@/$$dir ; \ + test -f $(DESTDIR)@confdir@/$$dir/$$filename || \ + test -f $(DESTDIR)@confdir@/$$dir/$$filename.noload || \ + $(INSTALL) -m 644 $$src_dir/$$filename $(DESTDIR)@confdir@/$$dir; \ done samples-htdocs: @@ -244,7 +245,7 @@ $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ done $(mkinstalldirs) $(DESTDIR)@modinstdir@ - test -d $(DESTDIR)$(prefix)/conf || $(MAKE) samples-conf + test -d $(DESTDIR)@confdir@ || $(MAKE) samples-conf test -d $(DESTDIR)$(prefix)/htdocs || $(MAKE) samples-htdocs .version: @@ -429,7 +430,7 @@ -e "s,@LIB_DIR\@,@libdir@," \ -e "s,@BIN_DIR\@,@bindir@," \ -e "s,@INC_DIR\@,@includedir@," \ - -e "s,@CFG_DIR\@,$(PREFIX)/conf," \ + -e "s,@CFG_DIR\@,@confdir@," \ -e "s,@DB_DIR\@,$(PREFIX)/db," \ -e "s,@PREFIX\@,$(PREFIX)," \ -e "s,@CC\@,$(CC)," \

1 0

[commit] r11669 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 12:29:51 2009 New Revision: 11669 Log: update the src to reference mod_dahdi_codec Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Fri Feb 6 12:29:51 2009 @@ -24,7 +24,7 @@ * Contributor(s): * Moises Silva <moy(a)sangoma.com> * - * mod_dahdi -- DAHDI Codecs (G729A 8.0kbit, G723.1 5.3kbit) + * mod_dahdi_codec -- DAHDI Codecs (G729A 8.0kbit, G723.1 5.3kbit) * * Thanks to Voiceway for sponsoring this module and Neocenter for providing the DAHDI hardware to test * @@ -53,8 +53,8 @@ static const char transcoding_device[] = "/dev/dahdi/transcode"; static const char transcoder_name[] = "DAHDI"; -SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_load); -SWITCH_MODULE_DEFINITION(mod_dahdi, mod_dahdi_load, NULL, NULL); +SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_codec_load); +SWITCH_MODULE_DEFINITION(mod_dahdi_codec, mod_dahdi_codec_load, NULL, NULL); struct dahdi_context { int32_t encoding_fd; @@ -301,7 +301,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_load) +SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_codec_load) { switch_api_interface_t *api_interface; switch_codec_interface_t *codec_interface;

1 0

[commit] r11668 - freeswitch/trunk/build
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 12:27:40 2009 New Revision: 11668 Log: adding to modules.conf.in 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 Fri Feb 6 12:27:40 2009 @@ -30,6 +30,7 @@ codecs/mod_speex #codecs/mod_siren #codecs/mod_celt +#codecs/mod_dahdi_codec #dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml dialplans/mod_dialplan_asterisk

1 0

[commit] r11667 - in freeswitch/trunk/src/mod/codecs: mod_dahdi mod_dahdi_codec
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 12:26:53 2009 New Revision: 11667 Log: rename so nobody is confused that this is just the codec interface Added: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/ - copied from r11665, /freeswitch/trunk/src/mod/codecs/mod_dahdi/ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c - copied unchanged from r11665, /freeswitch/trunk/src/mod/codecs/mod_dahdi/mod_dahdi.c Removed: freeswitch/trunk/src/mod/codecs/mod_dahdi/ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi.c

1 0

[commit] r11666 - in freeswitch/trunk: . build/config
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 12:23:14 2009 New Revision: 11666 Log: tweak odbc detection Modified: freeswitch/trunk/build/config/odbc.m4 freeswitch/trunk/configure.in Modified: freeswitch/trunk/build/config/odbc.m4 ============================================================================== --- freeswitch/trunk/build/config/odbc.m4 (original) +++ freeswitch/trunk/build/config/odbc.m4 Fri Feb 6 12:23:14 2009 @@ -119,7 +119,9 @@ ac_cv_odbc_where_lib=$with_odbc_lib fi if test "X$ac_cv_odbc_where_lib" = "X"; then + AC_CHECK_LIB([odbc],[SQLDisconnect],[ac_cv_odbc_where_lib="yes"],[ ODBC_LIB_WHERE(/usr/$LIB_SUBDIR /usr/local/$LIB_SUBDIR) + ]) fi if test "X$with_odbc_include" != "X"; then @@ -138,15 +140,16 @@ AC_MSG_RESULT(yes) ODBC_INC_DIR=$ac_cv_pcap_where_inc ODBC_LIB_DIR=$ac_cv_pcap_where_lib - ODBC_INC_FLAGS="-I${ODBC_INC_DIR}" + ODBC_INC_FLAGS="-I$ac_cv_pcap_where_inc" + ODBC_LIB_FLAGS="-Wl,-lodbc" case "$host" in *darwin*) - ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc -framework CoreFoundation" - ;; - *) - ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc" + ODBC_LIB_FLAGS="$ODBC_LIB_FLAGS -framework CoreFoundation" ;; esac + if test "$ac_cv_odbc_where_lib" != "yes"; then + ODBC_LIB_FLAGS="-L$ac_cv_odbc_where_lib $ODBC_LIB_FLAGS" + fi AC_SUBST(ODBC_INC_DIR) AC_SUBST(ODBC_LIB_DIR) AC_SUBST(ODBC_INC_FLAGS) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Feb 6 12:23:14 2009 @@ -112,7 +112,7 @@ # set defaults for use on all platforms SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" -SWITCH_AM_LDFLAGS="-lm -L/usr/local/lib" +SWITCH_AM_LDFLAGS="-lm" #set SOLINK variable based on compiler and host if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then @@ -161,11 +161,15 @@ APR_ADDTO(SWITCH_AM_CFLAGS, -m64) APR_ADDTO(SWITCH_AM_CXXFLAGS, -m64) APR_ADDTO(SWITCH_AM_LDFLAGS, -m64) + LIBS="$LIBS -m64" fi elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) + if test "${enable_64}" = "yes"; then + LIBS="$LIBS -m64" + fi fi # Enable debugging (default: on)

1 0

[commit] r11665 - freeswitch/trunk/src/mod/codecs/mod_dahdi
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 12:21:08 2009 New Revision: 11665 Log: add MODCODEC-7, thanks moy Added: freeswitch/trunk/src/mod/codecs/mod_dahdi/ freeswitch/trunk/src/mod/codecs/mod_dahdi/mod_dahdi.c Added: freeswitch/trunk/src/mod/codecs/mod_dahdi/mod_dahdi.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi/mod_dahdi.c Fri Feb 6 12:21:08 2009 @@ -0,0 +1,416 @@ +/* + * 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 / DAHDI codec module + * + * The Initial Developer of the Original Code is + * Moises Silva <moy(a)sangoma.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Moises Silva <moy(a)sangoma.com> + * + * mod_dahdi -- DAHDI Codecs (G729A 8.0kbit, G723.1 5.3kbit) + * + * Thanks to Voiceway for sponsoring this module and Neocenter for providing the DAHDI hardware to test + * + */ + +#include <switch.h> +#include <g711.h> +#include <dahdi/user.h> +#include <sys/ioctl.h> + +/*#define DEBUG_DAHDI_CODEC 1*/ + +#define DAHDI_FORMAT_G723_1 (1 << 0) +#define DAHDI_FORMAT_ULAW (1 << 2) +#define DAHDI_FORMAT_SLINEAR (1 << 6) +#define DAHDI_FORMAT_G729A (1 << 8) + +#define CODEC_G729_IANA_CODE 18 +#define CODEC_G723_IANA_CODE 4 + +switch_mutex_t *transcoder_counter_mutex; +static uint32_t total_encoders = 0; +static uint32_t total_encoders_usage = 0; +static uint32_t total_decoders = 0; +static uint32_t total_decoders_usage = 0; +static const char transcoding_device[] = "/dev/dahdi/transcode"; +static const char transcoder_name[] = "DAHDI"; + +SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_load); +SWITCH_MODULE_DEFINITION(mod_dahdi, mod_dahdi_load, NULL, NULL); + +struct dahdi_context { + int32_t encoding_fd; + int32_t decoding_fd; + uint8_t codec_r; +}; + +static int32_t switch_dahdi_get_transcoder(struct dahdi_transcoder_formats *fmts) +{ + int32_t fd = open(transcoding_device, O_RDWR); + if (fd < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Failed to open %s transcoder device: %s.\n", + transcoder_name, strerror(errno)); + return -1; + } + if (ioctl(fd, DAHDI_TC_ALLOCATE, fmts)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Failed to attach to transcoder: %s.\n", + strerror(errno)); + close(fd); + return -1; + } + if (fmts->srcfmt & DAHDI_FORMAT_ULAW) { + switch_mutex_lock(transcoder_counter_mutex); + total_encoders_usage++; + switch_mutex_unlock(transcoder_counter_mutex); + } else { + switch_mutex_lock(transcoder_counter_mutex); + total_decoders_usage++; + switch_mutex_unlock(transcoder_counter_mutex); + } + return fd; +} + +static switch_status_t switch_dahdi_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + struct dahdi_context *context = NULL; + struct dahdi_transcoder_formats fmts; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI init called.\n"); + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding)) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No encoding or decoding requested for DAHDI transcoder?.\n"); +#endif + return SWITCH_STATUS_FALSE; + } + + if (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context)))) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate memory for dahdi codec context.\n"); +#endif + return SWITCH_STATUS_FALSE; + } + + if (encoding) { + fmts.srcfmt = DAHDI_FORMAT_ULAW; + fmts.dstfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1; + context->encoding_fd = switch_dahdi_get_transcoder(&fmts); + if (context->decoding_fd < 0) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "encoding requested and denied with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + return SWITCH_STATUS_FALSE; + } + /* ulaw requires 8 times more storage than g729 and 12 times more than G723, right? */ + context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? 8 : 12; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoding requested and granted with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + } + if (decoding) { + fmts.dstfmt = DAHDI_FORMAT_ULAW; + fmts.srcfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1; + context->decoding_fd = switch_dahdi_get_transcoder(&fmts); + if (context->decoding_fd < 0) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and denied with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + return SWITCH_STATUS_FALSE; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and granted with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + } + codec->private_info = context; + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_dahdi_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) +{ + int32_t res; + short *dbuf_linear; + unsigned char *ebuf_g729; + unsigned char ebuf_ulaw[decoded_data_len/2]; + uint32_t i; + struct dahdi_context *context = NULL; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI encode called to encode %d bytes.\n", decoded_data_len); +#endif + context = codec->private_info; + dbuf_linear = decoded_data; + ebuf_g729 = encoded_data; + for (i = 0; i < decoded_data_len / sizeof(short); i++) { + ebuf_ulaw[i] = linear_to_ulaw(dbuf_linear[i]); + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Writing %d bytes of decoded ulaw data.\n", i); +#endif + res = write(context->encoding_fd, ebuf_ulaw, i); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to %s encoder device.\n", transcoder_name); + return SWITCH_STATUS_FALSE; + } + if (i != res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested to write %d bytes to %s encoder device, but only wrote %d bytes.\n", i, transcoder_name, res); + return SWITCH_STATUS_FALSE; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrote %d bytes of decoded ulaw data.\n", res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read %d bytes of encoded data.\n", i/context->codec_r); +#endif + res = read(context->encoding_fd, encoded_data, i/context->codec_r); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s encoder device: %s.\n", transcoder_name, strerror(errno)); + return SWITCH_STATUS_FALSE; + } + *encoded_data_len = res; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Read %d bytes of encoded data.\n", res); +#endif + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_dahdi_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) +{ + int32_t res; + short *dbuf_linear; + unsigned char dbuf_ulaw[encoded_data_len * ((struct dahdi_context*)codec->private_info)->codec_r]; + unsigned char *ebuf_g729; + uint32_t i; + struct dahdi_context *context; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode called to decode %d bytes.\n", encoded_data_len); +#endif + + context = codec->private_info; + dbuf_linear = decoded_data; + ebuf_g729 = encoded_data; + + if (*flag & SWITCH_CODEC_FLAG_SILENCE) { + memset(dbuf_linear, 0, codec->implementation->decoded_bytes_per_packet); + *decoded_data_len = codec->implementation->decoded_bytes_per_packet; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode in silence returned %d bytes.\n", *decoded_data_len); +#endif + return SWITCH_STATUS_SUCCESS; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Writing %d bytes to decode.\n", encoded_data_len); +#endif + res = write(context->decoding_fd, ebuf_g729, encoded_data_len); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to %s decoder device.\n", transcoder_name); + return SWITCH_STATUS_FALSE; + } + if (encoded_data_len != res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested to write %d bytes to %s decoder device, but only wrote %d bytes.\n", encoded_data_len, transcoder_name, res); + return SWITCH_STATUS_FALSE; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrote %d bytes to decode.\n", res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read from device %d bytes of decoded ulaw data.\n", + encoded_data_len*context->codec_r); +#endif + res = read(context->decoding_fd, dbuf_ulaw, encoded_data_len*context->codec_r); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s encoder device: %s.\n", transcoder_name, strerror(errno)); + return SWITCH_STATUS_FALSE; + } + for (i = 0; i < res; i++) { + dbuf_linear[i] = ulaw_to_linear(dbuf_ulaw[i]); + } + *decoded_data_len = i * 2; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode returned %d bytes.\n", *decoded_data_len); +#endif + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_dahdi_destroy(switch_codec_t *codec) +{ + /* memory pool takes care of the private_info memory */ + struct dahdi_context *context = codec->private_info; + if (context->encoding_fd >= 0) { + switch_mutex_lock(transcoder_counter_mutex); + total_encoders_usage--; + switch_mutex_unlock(transcoder_counter_mutex); + close(context->encoding_fd); + } + if (context->decoding_fd >= 0) { + switch_mutex_lock(transcoder_counter_mutex); + total_decoders_usage--; + switch_mutex_unlock(transcoder_counter_mutex); + close(context->decoding_fd); + } + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_STANDARD_API(dahdi_transcode_usage) +{ + if (!total_encoders && !total_decoders) { + stream->write_function(stream, "No DAHDI transcoding hardware found.\n"); + return SWITCH_STATUS_SUCCESS; + } + switch_mutex_lock(transcoder_counter_mutex); + stream->write_function(stream, "Using %d encoders of a total of %d available.\n", + total_encoders_usage, total_encoders); + stream->write_function(stream, "Using %d decoders of a total of %d available.\n", + total_decoders_usage, total_decoders); + switch_mutex_unlock(transcoder_counter_mutex); + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_load) +{ + switch_api_interface_t *api_interface; + switch_codec_interface_t *codec_interface; + struct dahdi_transcoder_info info = { 0 }; + int32_t fd, res; + + total_encoders = 0; + total_encoders_usage = 0; + total_decoders = 0; + total_decoders_usage = 0; + + fd = open(transcoding_device, O_RDWR); + if (fd < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open %s transcoder device.\n", transcoder_name); + return SWITCH_STATUS_FALSE; + } + + for (info.tcnum = 0; !(res = ioctl(fd, DAHDI_TC_GETINFO, &info)); info.tcnum++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found dahdi transcoder name: %s\n", info.name); + if ((info.srcfmts & DAHDI_FORMAT_ULAW) && (info.dstfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) { + total_encoders += info.numchannels/2; + continue; + } + if ((info.dstfmts & DAHDI_FORMAT_ULAW) && (info.srcfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) { + total_decoders += info.numchannels/2; + continue; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, + "Not using transcoder %s, we just support ULAW and G723.1/G729A", info.name); + } + close(fd); + + if (!total_encoders && !total_decoders) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No DAHDI transcoders found.\n"); + return SWITCH_STATUS_FALSE; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Found %d ULAW to G729A/G723.1 encoders.\n", total_encoders); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Found %d G729A/G723.1 to ULAW decoders.\n", total_decoders); + + switch_mutex_init(&transcoder_counter_mutex, SWITCH_MUTEX_UNNESTED, pool); + + /* 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, "DAHDI G.729A 8.0k"); /* 8.0kbit */ + int mpf = 20000; /* Algorithmic delay of 15ms with 5ms of look-ahead delay */ + int spf = 160; + int bpfd = 320; + int bpfc = 20; + int fpnp = 10; + switch_core_codec_add_implementation(pool, + codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 18, /* the IANA code number */ + "G729", /* 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 */ + 8000, /* bits transferred per second */ + mpf, /* number of microseconds per frame (10ms frames) */ + spf, /* number of samples per frame */ + bpfd, /* number of bytes per frame decompressed */ + bpfc, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + fpnp, /* number of frames per network packet */ + switch_dahdi_init, /* function to initialize a codec handle using this implementation */ + switch_dahdi_encode, /* function to encode raw data into encoded data */ + switch_dahdi_decode, /* function to decode encoded data into raw data */ + switch_dahdi_destroy); /* deinitalize a codec handle using this implementation */ + + SWITCH_ADD_CODEC(codec_interface, "DAHDI G.723.1 5.3k"); /* 5.3kbit */ + mpf = 30000; /* Algorithmic delay of 37.5ms with 7.5ms of look-ahead delay */ + spf = 240; + bpfd = 480; + bpfc = 20; + fpnp = 10; + switch_core_codec_add_implementation(pool, + codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 4, /* the IANA code number */ + "G723", /* 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 */ + 8000, /* bits transferred per second */ + mpf, /* number of microseconds per frame (10ms frames) */ + spf, /* number of samples per frame */ + bpfd, /* number of bytes per frame decompressed */ + bpfc, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + fpnp, /* number of frames per network packet */ + switch_dahdi_init, /* function to initialize a codec handle using this implementation */ + switch_dahdi_encode, /* function to encode raw data into encoded data */ + switch_dahdi_decode, /* function to decode encoded data into raw data */ + switch_dahdi_destroy); /* deinitalize a codec handle using this implementation */ + + SWITCH_ADD_API(api_interface, "dahdi_transcode", "DAHDI Transcode", dahdi_transcode_usage, NULL); + switch_console_set_complete("add dahdi_transcode"); + /* 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: + */

1 0

[commit] r11664 - in freeswitch/trunk: libs/esl scripts
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 10:05:46 2009 New Revision: 11664 Log: doh Modified: freeswitch/trunk/libs/esl/testclient.c freeswitch/trunk/scripts/freeswitch-gcore Modified: freeswitch/trunk/libs/esl/testclient.c ============================================================================== --- freeswitch/trunk/libs/esl/testclient.c (original) +++ freeswitch/trunk/libs/esl/testclient.c Fri Feb 6 10:05:46 2009 @@ -9,21 +9,7 @@ esl_connect(&handle, "localhost", 8021, "ClueCon"); - esl_send_recv(&handle, "api conference 3100 play /root/sr8k.raw 1\n\n"); - - esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3101\n\n"); - - esl_send_recv(&handle, "api conference 3101 play /root/sr8k.raw 2\n\n"); - - esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3102\n\n"); - - esl_send_recv(&handle, "api conference 3102 play /root/sr8k.raw 3\n\n"); - - esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3103\n\n"); - - esl_send_recv(&handle, "api conference 3103 play /root/sr8k.raw 4\n\n"); - - esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3104\n\n"); + esl_send_recv(&handle, "api status\n\n"); esl_disconnect(&handle); Modified: freeswitch/trunk/scripts/freeswitch-gcore ============================================================================== --- freeswitch/trunk/scripts/freeswitch-gcore (original) +++ freeswitch/trunk/scripts/freeswitch-gcore Fri Feb 6 10:05:46 2009 @@ -9,4 +9,4 @@ --eval-command='thread apply all bt' \ --eval-command='thread apply all bt full' \ --eval-command='quit' -#rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid +rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid

1 0