git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1357 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-05-04 20:38:01 +00:00
parent 0c27a246b3
commit a4b1fdc709
7 changed files with 451 additions and 453 deletions

View File

@ -35,8 +35,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
build_triplet = x86_64-unknown-linux-gnu build_triplet = i686-pc-linux-gnu
host_triplet = x86_64-unknown-linux-gnu host_triplet = i686-pc-linux-gnu
DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \ DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
@ -168,18 +168,18 @@ am__quote =
am__tar = ${AMTAR} chof - "$$tardir" am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf - am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin bindir = ${exec_prefix}/bin
build = x86_64-unknown-linux-gnu build = i686-pc-linux-gnu
build_alias = build_alias =
build_cpu = x86_64 build_cpu = i686
build_os = linux-gnu build_os = linux-gnu
build_vendor = unknown build_vendor = pc
datadir = ${prefix}/share datadir = ${prefix}/share
exec_prefix = ${prefix} exec_prefix = ${prefix}
host = x86_64-unknown-linux-gnu host = i686-pc-linux-gnu
host_alias = host_alias =
host_cpu = x86_64 host_cpu = i686
host_os = linux-gnu host_os = linux-gnu
host_vendor = unknown host_vendor = pc
includedir = ${prefix}/include includedir = ${prefix}/include
infodir = ${prefix}/info infodir = ${prefix}/info
install_sh = /usr/src/freeswitch.trunk/libs/libspeakup/install-sh install_sh = /usr/src/freeswitch.trunk/libs/libspeakup/install-sh

File diff suppressed because it is too large Load Diff

View File

@ -512,13 +512,13 @@ s,@AMDEPBACKSLASH@,\,;t t
s,@CCDEPMODE@,depmode=gcc3,;t t s,@CCDEPMODE@,depmode=gcc3,;t t
s,@am__fastdepCC_TRUE@,,;t t s,@am__fastdepCC_TRUE@,,;t t
s,@am__fastdepCC_FALSE@,#,;t t s,@am__fastdepCC_FALSE@,#,;t t
s,@build@,x86_64-unknown-linux-gnu,;t t s,@build@,i686-pc-linux-gnu,;t t
s,@build_cpu@,x86_64,;t t s,@build_cpu@,i686,;t t
s,@build_vendor@,unknown,;t t s,@build_vendor@,pc,;t t
s,@build_os@,linux-gnu,;t t s,@build_os@,linux-gnu,;t t
s,@host@,x86_64-unknown-linux-gnu,;t t s,@host@,i686-pc-linux-gnu,;t t
s,@host_cpu@,x86_64,;t t s,@host_cpu@,i686,;t t
s,@host_vendor@,unknown,;t t s,@host_vendor@,pc,;t t
s,@host_os@,linux-gnu,;t t s,@host_os@,linux-gnu,;t t
s,@EGREP@,grep -E,;t t s,@EGREP@,grep -E,;t t
s,@LN_S@,ln -s,;t t s,@LN_S@,ln -s,;t t

View File

@ -44,7 +44,7 @@ available_tags=" CXX"
# ### BEGIN LIBTOOL CONFIG # ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host drone1: # Libtool was configured on host agentbox3:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
@ -66,12 +66,12 @@ fast_install=yes
# The host system. # The host system.
host_alias= host_alias=
host=x86_64-unknown-linux-gnu host=i686-pc-linux-gnu
host_os=linux-gnu host_os=linux-gnu
# The build system. # The build system.
build_alias= build_alias=
build=x86_64-unknown-linux-gnu build=i686-pc-linux-gnu
build_os=linux-gnu build_os=linux-gnu
# An echo program that does not interpret backslashes. # An echo program that does not interpret backslashes.
@ -94,7 +94,7 @@ with_gcc=yes
EGREP="grep -E" EGREP="grep -E"
# The linker used to build libraries. # The linker used to build libraries.
LD="/usr/bin/ld -m elf_x86_64" LD="/usr/bin/ld"
# Whether we need hard or soft links. # Whether we need hard or soft links.
LN_S="ln -s" LN_S="ln -s"
@ -144,7 +144,7 @@ pic_flag=" -fPIC -DPIC"
pic_mode=default pic_mode=default
# What is the maximum length of a command? # What is the maximum length of a command?
max_cmd_len=64 max_cmd_len=32768
# Does compiler simultaneously support -c and -o options? # Does compiler simultaneously support -c and -o options?
compiler_c_o="yes" compiler_c_o="yes"
@ -322,10 +322,10 @@ variables_saved_for_relink="PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBR
link_all_deplibs=unknown link_all_deplibs=unknown
# Compile-time system search path for libraries # Compile-time system search path for libraries
sys_lib_search_path_spec=" /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/ /usr/lib/gcc/x86_64-unknown-linux-gnu/3.4.4/ /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../../x86_64-unknown-linux-gnu/lib/x86_64-unknown-linux-gnu/3.4.4/ /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../../x86_64-unknown-linux-gnu/lib/ /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../x86_64-unknown-linux-gnu/3.4.4/ /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../ /lib/x86_64-unknown-linux-gnu/3.4.4/ /lib/ /usr/lib/x86_64-unknown-linux-gnu/3.4.4/ /usr/lib/" sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../ /lib/i686-pc-linux-gnu/3.3.4/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/"
# Run-time system search path for libraries # Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/local/lib /usr/local/freeswitch/lib /lib32 /usr/lib32 /usr/X11R6/lib64 /usr/X11R6/lib32 /usr/X11R6/lib /opt/swift/lib /usr/local/freeswitch/lib32 " sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/freeswitch/lib /root/pwlib/lib /root/opal/lib /usr/X11R6/lib /usr/local/lib /opt/swift/lib "
# Fix the shell variable $srcfile for the compiler. # Fix the shell variable $srcfile for the compiler.
fix_srcfile_path="" fix_srcfile_path=""
@ -6751,7 +6751,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End: # End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX # ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host drone1: # Libtool was configured on host agentbox3:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
@ -6773,12 +6773,12 @@ fast_install=yes
# The host system. # The host system.
host_alias= host_alias=
host=x86_64-unknown-linux-gnu host=i686-pc-linux-gnu
host_os=linux-gnu host_os=linux-gnu
# The build system. # The build system.
build_alias= build_alias=
build=x86_64-unknown-linux-gnu build=i686-pc-linux-gnu
build_os=linux-gnu build_os=linux-gnu
# An echo program that does not interpret backslashes. # An echo program that does not interpret backslashes.
@ -6801,7 +6801,7 @@ with_gcc=yes
EGREP="grep -E" EGREP="grep -E"
# The linker used to build libraries. # The linker used to build libraries.
LD="/usr/bin/ld -m elf_x86_64" LD="/usr/bin/ld"
# Whether we need hard or soft links. # Whether we need hard or soft links.
LN_S="ln -s" LN_S="ln -s"
@ -6851,7 +6851,7 @@ pic_flag=" -fPIC -DPIC"
pic_mode=default pic_mode=default
# What is the maximum length of a command? # What is the maximum length of a command?
max_cmd_len=64 max_cmd_len=32768
# Does compiler simultaneously support -c and -o options? # Does compiler simultaneously support -c and -o options?
compiler_c_o="yes" compiler_c_o="yes"
@ -6930,11 +6930,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a # Dependencies to place before the objects being linked to create a
# shared library. # shared library.
predep_objects="/usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../../lib64/crti.o /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/crtbeginS.o" predep_objects="/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../crti.o /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/crtbeginS.o"
# Dependencies to place after the objects being linked to create a # Dependencies to place after the objects being linked to create a
# shared library. # shared library.
postdep_objects="/usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/crtendS.o /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../../lib64/crtn.o" postdep_objects="/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/crtendS.o /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../crtn.o"
# Dependencies to place before the objects being linked to create a # Dependencies to place before the objects being linked to create a
# shared library. # shared library.
@ -6946,7 +6946,7 @@ postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
# The library search path used internally by the compiler when linking # The library search path used internally by the compiler when linking
# a shared library. # a shared library.
compiler_lib_search_path="-L/usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4 -L/usr/lib/gcc/x86_64-unknown-linux-gnu/3.4.4 -L/usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../../lib64 -L/usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../.. -L/lib/../lib64 -L/usr/lib/../lib64" compiler_lib_search_path="-L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4 -L/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../.."
# Method to check whether dependent libraries are shared objects. # Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all" deplibs_check_method="pass_all"
@ -7026,10 +7026,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs=unknown link_all_deplibs=unknown
# Compile-time system search path for libraries # Compile-time system search path for libraries
sys_lib_search_path_spec=" /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/ /usr/lib/gcc/x86_64-unknown-linux-gnu/3.4.4/ /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../../x86_64-unknown-linux-gnu/lib/x86_64-unknown-linux-gnu/3.4.4/ /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../../x86_64-unknown-linux-gnu/lib/ /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../x86_64-unknown-linux-gnu/3.4.4/ /usr/lib64/gcc/x86_64-unknown-linux-gnu/3.4.4/../../../ /lib/x86_64-unknown-linux-gnu/3.4.4/ /lib/ /usr/lib/x86_64-unknown-linux-gnu/3.4.4/ /usr/lib/" sys_lib_search_path_spec=" /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../i686-pc-linux-gnu/3.3.4/ /usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.4/../../../ /lib/i686-pc-linux-gnu/3.3.4/ /lib/ /usr/lib/i686-pc-linux-gnu/3.3.4/ /usr/lib/"
# Run-time system search path for libraries # Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/local/lib /usr/local/freeswitch/lib /lib32 /usr/lib32 /usr/X11R6/lib64 /usr/X11R6/lib32 /usr/X11R6/lib /opt/swift/lib /usr/local/freeswitch/lib32 " sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/freeswitch/lib /root/pwlib/lib /root/opal/lib /usr/X11R6/lib /usr/local/lib /opt/swift/lib "
# Fix the shell variable $srcfile for the compiler. # Fix the shell variable $srcfile for the compiler.
fix_srcfile_path="" fix_srcfile_path=""

View File

@ -212,7 +212,7 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, ch
/*! /*!
\brief Load a module \brief Load a module
\param interface a pointer to a pointer to aim at your module's local interface \param module_interface a pointer to a pointer to aim at your module's local interface
\param filename the path to the module's dll or so file \param filename the path to the module's dll or so file
\return SWITCH_STATUS_SUCCESS on a successful load \return SWITCH_STATUS_SUCCESS on a successful load
*/ */

View File

@ -496,7 +496,7 @@ static switch_status_t activate_rtp(struct private_object *tech_pvt)
tech_pvt->read_codec.codec_interface->ianacode, tech_pvt->read_codec.codec_interface->ianacode,
tech_pvt->read_codec.implementation->encoded_bytes_per_frame, tech_pvt->read_codec.implementation->encoded_bytes_per_frame,
ms, ms,
SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_TIMER_RECLOCK | SWITCH_RTP_FLAG_RAW_WRITE, SWITCH_RTP_FLAG_MINI | SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_TIMER_RECLOCK | SWITCH_RTP_FLAG_RAW_WRITE,
key, key,
&err, switch_core_session_get_pool(tech_pvt->session)); &err, switch_core_session_get_pool(tech_pvt->session));

View File

@ -1134,7 +1134,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t data
mini.header.ts = send_msg->header.ts; mini.header.ts = send_msg->header.ts;
mini.header.version = 1; mini.header.version = 1;
memcpy(mini.body, send_msg->body, bytes); memcpy(mini.body, send_msg->body, bytes);
bytes += sizeof(rtp_mini_msg_t); bytes += sizeof(srtp_mini_hdr_t);
switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)&mini, &bytes); switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)&mini, &bytes);
} else { } else {
switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes); switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes);