Skip to content

F
freeswitch
提交 67228dbd authored 作者: Giovanni Maruzzelli's avatar Giovanni Maruzzelli
浏览文件
操作

skypiax: nothin to see here 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16618 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 c6d10622
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 31343 行增加 和 28 行删除
src/mod/endpoints/mod_skypiax/073_low_latency/1.diff 0 → 100644
浏览文件 @ 67228dbd
Index: skypiax_protocol.c
===================================================================
--- skypiax_protocol.c (revision 16583)
+++ skypiax_protocol.c (working copy)
@@ -1040,22 +1040,35 @@
fdselect = fd;
FD_SET(fdselect, &fs);
+#if 1
//FIXME rt = select(fdselect + 1, NULL, &fs, NULL, &to);
while (tech_pvt->flag_audio_cli == 0) {
#ifdef WIN32
skypiax_sleep(100); //0.1 millisec
#else
- skypiax_sleep(1000); //1 millisec
+ skypiax_sleep(10000); //10 millisec
#endif //WIN32
//WARNINGA("write now is 0\n", SKYPIAX_P_LOG);
}
//ERRORA("write is now 1\n", SKYPIAX_P_LOG);
rt = 1;
+#endif //0
+ //rt = select(fdselect + 1, NULL, &fs, NULL, NULL);
if (rt > 0) {
int counter;
-
+#if 0
+ while (tech_pvt->flag_audio_cli == 0) {
+#ifdef WIN32
+ skypiax_sleep(100); //0.1 millisec
+#else
+ skypiax_sleep(10000); //10 millisec
+#endif //WIN32
+ WARNINGA("write now is 0\n", SKYPIAX_P_LOG);
+ }
+#endif //0
+
/* until we drained the pipe to empty */
//for (counter = 0; counter < 10; counter++) {
for (counter = 0; counter < 1; counter++) {
@@ -1155,10 +1168,10 @@
#ifdef WIN32
skypiax_sleep(100); //0.1 millisec
#else
- skypiax_sleep(1000); //1 millisec
+ skypiax_sleep(10000); //10 millisec
#endif //WIN32
- //WARNINGA("read now is 0\n", SKYPIAX_P_LOG);
+ WARNINGA("read now is 0\n", SKYPIAX_P_LOG);
}
//ERRORA("read is now 1\n", SKYPIAX_P_LOG);
//samples = skypiax_pipe_read(tech_pvt->audiopipe_srv[0], tech_pvt->read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
src/mod/endpoints/mod_skypiax/073_low_latency/Makefile.am 0 → 100644
浏览文件 @ 67228dbd
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_skypiax
mod_LTLIBRARIES = mod_skypiax.la
mod_skypiax_la_SOURCES = mod_skypiax.c skypiax_protocol.c
mod_skypiax_la_CFLAGS = $(AM_CFLAGS) -DSKYPIAX_SVN_VERSION=\"`cat $(switch_builddir)/.version`\"
mod_skypiax_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_skypiax_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lX11
src/mod/endpoints/mod_skypiax/073_low_latency/README 0 → 100644
浏览文件 @ 67228dbd
Skypiax, Skype Endpoint and Trunk
All documentation on compiling, using, configuring,
tricks and tweaks, possible problems at:
http://wiki.freeswitch.org/wiki/Skypiax_Skype_Endpoint_and_Trunk
< gmaruzz at gmail dot com >
src/mod/endpoints/mod_skypiax/073_low_latency/mod_skypiax.2008.vcproj 0 → 100644
浏览文件 @ 67228dbd
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="mod_skypiax"
ProjectGUID="{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}"
RootNamespace="mod_skypiax"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="rpcrt4.lib "
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="rpcrt4.lib "
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\mod_skypiax\mod_skypiax.c"
>
</File>
<File
RelativePath=".\skypiax.h"
>
</File>
<File
RelativePath=".\skypiax_protocol.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
src/mod/endpoints/mod_skypiax/073_low_latency/mod_skypiax.log 0 → 100644
浏览文件 @ 67228dbd
gcc -shared .libs/mod_skypiax_la-mod_skypiax.o .libs/mod_skypiax_la-skypiax_protocol.o -Wl,--rpath -Wl,/usr/src/freeswitch/.libs -Wl,--rpath -Wl,/usr/local/freeswitch/lib -lm -lX11 /usr/src/freeswitch/.libs/libfreeswitch.so -L/usr/src/freeswitch/libs/apr-util/xml/expat/lib -L/usr/src/freeswitch/libs/apr-util/xml/expat/lib/.libs -L/usr/src/freeswitch/libs/apr/.libs -L/usr/src/freeswitch/libs/srtp -lncurses -Wl,-soname -Wl,mod_skypiax.so -o .libs/mod_skypiax.so
ar cru .libs/mod_skypiax.a mod_skypiax_la-mod_skypiax.o mod_skypiax_la-skypiax_protocol.o
ranlib .libs/mod_skypiax.a
creating mod_skypiax.la
(cd .libs && rm -f mod_skypiax.la && ln -s ../mod_skypiax.la mod_skypiax.la)
src/mod/endpoints/mod_skypiax/074_low_latency/1.diff 0 → 100644
浏览文件 @ 67228dbd
Index: skypiax_protocol.c
===================================================================
--- skypiax_protocol.c (revision 16583)
+++ skypiax_protocol.c (working copy)
@@ -1040,22 +1040,35 @@
fdselect = fd;
FD_SET(fdselect, &fs);
+#if 1
//FIXME rt = select(fdselect + 1, NULL, &fs, NULL, &to);
while (tech_pvt->flag_audio_cli == 0) {
#ifdef WIN32
skypiax_sleep(100); //0.1 millisec
#else
- skypiax_sleep(1000); //1 millisec
+ skypiax_sleep(10000); //10 millisec
#endif //WIN32
//WARNINGA("write now is 0\n", SKYPIAX_P_LOG);
}
//ERRORA("write is now 1\n", SKYPIAX_P_LOG);
rt = 1;
+#endif //0
+ //rt = select(fdselect + 1, NULL, &fs, NULL, NULL);
if (rt > 0) {
int counter;
-
+#if 0
+ while (tech_pvt->flag_audio_cli == 0) {
+#ifdef WIN32
+ skypiax_sleep(100); //0.1 millisec
+#else
+ skypiax_sleep(10000); //10 millisec
+#endif //WIN32
+ WARNINGA("write now is 0\n", SKYPIAX_P_LOG);
+ }
+#endif //0
+
/* until we drained the pipe to empty */
//for (counter = 0; counter < 10; counter++) {
for (counter = 0; counter < 1; counter++) {
@@ -1155,10 +1168,10 @@
#ifdef WIN32
skypiax_sleep(100); //0.1 millisec
#else
- skypiax_sleep(1000); //1 millisec
+ skypiax_sleep(10000); //10 millisec
#endif //WIN32
- //WARNINGA("read now is 0\n", SKYPIAX_P_LOG);
+ WARNINGA("read now is 0\n", SKYPIAX_P_LOG);
}
//ERRORA("read is now 1\n", SKYPIAX_P_LOG);
//samples = skypiax_pipe_read(tech_pvt->audiopipe_srv[0], tech_pvt->read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
src/mod/endpoints/mod_skypiax/074_low_latency/Makefile.am 0 → 100644
浏览文件 @ 67228dbd
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_skypiax
mod_LTLIBRARIES = mod_skypiax.la
mod_skypiax_la_SOURCES = mod_skypiax.c skypiax_protocol.c
mod_skypiax_la_CFLAGS = $(AM_CFLAGS) -DSKYPIAX_SVN_VERSION=\"`cat $(switch_builddir)/.version`\"
mod_skypiax_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_skypiax_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lX11
src/mod/endpoints/mod_skypiax/074_low_latency/README 0 → 100644
浏览文件 @ 67228dbd
Skypiax, Skype Endpoint and Trunk
All documentation on compiling, using, configuring,
tricks and tweaks, possible problems at:
http://wiki.freeswitch.org/wiki/Skypiax_Skype_Endpoint_and_Trunk
< gmaruzz at gmail dot com >
src/mod/endpoints/mod_skypiax/074_low_latency/mod_skypiax.2008.vcproj 0 → 100644
浏览文件 @ 67228dbd
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="mod_skypiax"
ProjectGUID="{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}"
RootNamespace="mod_skypiax"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="rpcrt4.lib "
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="rpcrt4.lib "
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\mod_skypiax\mod_skypiax.c"
>
</File>
<File
RelativePath=".\skypiax.h"
>
</File>
<File
RelativePath=".\skypiax_protocol.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
src/mod/endpoints/mod_skypiax/074_low_latency/mod_skypiax.log 0 → 100644
浏览文件 @ 67228dbd
gcc -shared .libs/mod_skypiax_la-mod_skypiax.o .libs/mod_skypiax_la-skypiax_protocol.o -Wl,--rpath -Wl,/usr/src/freeswitch/.libs -Wl,--rpath -Wl,/usr/local/freeswitch/lib -lm -lX11 /usr/src/freeswitch/.libs/libfreeswitch.so -L/usr/src/freeswitch/libs/apr-util/xml/expat/lib -L/usr/src/freeswitch/libs/apr-util/xml/expat/lib/.libs -L/usr/src/freeswitch/libs/apr/.libs -L/usr/src/freeswitch/libs/srtp -lncurses -Wl,-soname -Wl,mod_skypiax.so -o .libs/mod_skypiax.so
ar cru .libs/mod_skypiax.a mod_skypiax_la-mod_skypiax.o mod_skypiax_la-skypiax_protocol.o
ranlib .libs/mod_skypiax.a
creating mod_skypiax.la
(cd .libs && rm -f mod_skypiax.la && ln -s ../mod_skypiax.la mod_skypiax.la)
src/mod/endpoints/mod_skypiax/skypiax.h
浏览文件 @ 67228dbd
......@@ -192,6 +192,8 @@ struct private_object {
switch_caller_profile_t *caller_profile;
switch_mutex_t *mutex;
switch_mutex_t *flag_mutex;
switch_mutex_t *flag_audio_cli_mutex;
switch_mutex_t *flag_audio_srv_mutex;
char interface_id[80];
char name[80];
......@@ -279,6 +281,8 @@ struct private_object {
uint32_t report_incoming_chatmessages;
switch_timer_t timer_read;
switch_timer_t timer_write;
unsigned int writefd;
unsigned int readfd;
};
typedef struct private_object private_t;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论