Menu
▾
▴
[Iaxclient-cvs] SF.net SVN: iaxclient: [1279] branches/team/elbunce/iaxclient
|
From: <do...@us...> - 2007-11-21 23:53:35
|
Revision: 1279
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1279&view=rev
Author: dohpaz
Date: 2007-11-21 15:53:32 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
Merge up to trunk of r1278.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/configure.ac
branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj
branches/team/elbunce/iaxclient/lib/audio_encode.c
branches/team/elbunce/iaxclient/lib/ringbuffer.c
Removed Paths:
-------------
branches/team/elbunce/iaxclient/contrib/win/vs2005/libvideolib.vcproj
Modified: branches/team/elbunce/iaxclient/configure.ac
===================================================================
--- branches/team/elbunce/iaxclient/configure.ac 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/configure.ac 2007-11-21 23:53:32 UTC (rev 1279)
@@ -392,8 +392,12 @@
# Autodetect clients
if test "x$enable_clients" = "xauto"; then
- clients="$clients testcall stresstest"
+ clients="$clients testcall"
+ if test x$has_oggz = xyes && test x$has_theora = xyes; then
+ clients="$clients stresstest"
+ fi
+
if test ! x$has_wx = xno; then
clients="$clients iaxphone"
if test "x$has_gdk2" = xyes; then
Modified: branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/contrib/win/vs2005/libvidcap.vcproj 2007-11-21 23:53:32 UTC (rev 1279)
@@ -187,6 +187,26 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowObject.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowSource.cpp"
>
<FileConfiguration
@@ -283,6 +303,26 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\SourceStateMachine.cpp"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ CompileAs="2"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\vidcap.c"
>
</File>
@@ -305,6 +345,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowObject.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\src\directshow\DirectShowSource.h"
>
</File>
@@ -321,18 +365,10 @@
>
</File>
<File
- RelativePath="..\..\..\..\libvidcap\src\directshow\LocklessQueue.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\libvidcap\src\logging.h"
>
</File>
<File
- RelativePath="..\..\..\..\libvidcap\src\logging.h"
- >
- </File>
- <File
RelativePath="..\..\..\..\libvidcap\src\sapi.h"
>
</File>
@@ -345,6 +381,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\libvidcap\src\directshow\SourceStateMachine.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\libvidcap\include\vidcap\vidcap.h"
>
</File>
Deleted: branches/team/elbunce/iaxclient/contrib/win/vs2005/libvideolib.vcproj
===================================================================
--- branches/team/elbunce/iaxclient/contrib/win/vs2005/libvideolib.vcproj 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/contrib/win/vs2005/libvideolib.vcproj 2007-11-21 23:53:32 UTC (rev 1279)
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="libvideolib"
- ProjectGUID="{BE15A94D-3766-4693-ABA8-5FBAACBBCC08}"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="4"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\..\lib\videoLib;..\..\..\lib;"$(PSDK_DIR)\Include";"$(PSDK_DIR)\Samples\Multimedia\DirectShow\BaseClasses";"$(DXSDK_DIR)\Include""
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- DisableSpecificWarnings="4312"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)\$(ConfigurationName)\$(ProjectName)"
- IntermediateDirectory="$(OutDir)"
- ConfigurationType="4"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\lib\videoLib;..\..\..\lib;"$(PSDK_DIR)\Include";"$(PSDK_DIR)\Samples\Multimedia\DirectShow\BaseClasses";"$(DXSDK_DIR)\Include""
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500"
- RuntimeLibrary="2"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DisableSpecificWarnings="4312"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLibrarianTool"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath="..\..\..\lib\videoLib\video_grab.c"
- >
- </File>
- <File
- RelativePath="..\..\..\lib\videoLib\win32\wingrab.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: branches/team/elbunce/iaxclient/lib/audio_encode.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/audio_encode.c 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/lib/audio_encode.c 2007-11-21 23:53:32 UTC (rev 1279)
@@ -94,7 +94,6 @@
static void set_speex_filters()
{
int i;
- float f;
if ( !st )
return;
@@ -107,10 +106,10 @@
speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i);
/* make vad more sensitive */
- f = 0.30f;
- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &f);
- f = 0.07f;
- speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &f);
+ i = 30;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_START, &i);
+ i = 7;
+ speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_PROB_CONTINUE, &i);
}
static void calculate_level(short *audio, int len, float *level)
Modified: branches/team/elbunce/iaxclient/lib/ringbuffer.c
===================================================================
--- branches/team/elbunce/iaxclient/lib/ringbuffer.c 2007-11-21 23:46:10 UTC (rev 1278)
+++ branches/team/elbunce/iaxclient/lib/ringbuffer.c 2007-11-21 23:53:32 UTC (rev 1279)
@@ -100,7 +100,7 @@
#elif defined(__GNUC__)
/* GCC understands volatile asm and "memory" to mean it
* should not reorder memory read/writes */
-# if defined( __ppc__ )
+# if defined( __ppc__ ) || defined( __powerpc__ )
# define rb_FullMemoryBarrier() asm volatile("sync":::"memory")
# define rb_ReadMemoryBarrier() asm volatile("sync":::"memory")
# define rb_WriteMemoryBarrier() asm volatile("sync":::"memory")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
