- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2234 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 07 Aug '06

07 Aug '06

Author: anthm Date: Mon Aug 7 15:45:52 2006 New Revision: 2234 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: iax tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Aug 7 15:45:52 2006 @@ -239,10 +239,9 @@ static const switch_codec_implementation_t *imp; for (imp = codecs[x]; imp; imp = imp->next) { unsigned int codec = iana2ast(imp->ianacode); - - if (io == IAX_QUERY) { + if (io == IAX_QUERY && !(codec & local_cap)) { iax_pref_codec_add(iax_session, codec); - } + } local_cap |= codec; } } @@ -254,6 +253,7 @@ } leading = iana2ast(codecs[0]->ianacode); + interval = codecs[0]->microseconds_per_frame / 1000; if (io == IAX_QUERY) { chosen = leading; *format = chosen; @@ -638,8 +638,12 @@ if (!tech_pvt->read_frame.datalen) { continue; } - *frame = &tech_pvt->read_frame; +#ifdef BIGENDIAN + if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) { + switch_swap_linear((*frame)->data, (int) (*frame)->datalen); + } +#endif return SWITCH_STATUS_SUCCESS; } @@ -674,7 +678,7 @@ if (!switch_test_flag(tech_pvt, TFLAG_IO)) { return SWITCH_STATUS_FALSE; } -#ifndef BIGENDIAN +#ifdef BIGENDIAN if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) { switch_swap_linear(frame->data, (int) frame->datalen / 2); }

1 0

[commit] r2233 - freeswitch/trunk/w32/vsnet/Tools/PortAudio
by Freeswitch SVN 07 Aug '06

07 Aug '06

Author: mikej Date: Mon Aug 7 15:28:27 2006 New Revision: 2233 Added: freeswitch/trunk/w32/vsnet/Tools/PortAudio/ freeswitch/trunk/w32/vsnet/Tools/PortAudio/PortAudio.vcproj freeswitch/trunk/w32/vsnet/Tools/PortAudio/portaudio.def Log: add build files for portaudio v19 testing (winMME only right now) Added: freeswitch/trunk/w32/vsnet/Tools/PortAudio/PortAudio.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/vsnet/Tools/PortAudio/PortAudio.vcproj Mon Aug 7 15:28:27 2006 @@ -0,0 +1,299 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="PortAudio" + ProjectGUID="{481CBC17-834D-4E45-AE5D-2F1E349863CE}" + RootNamespace="PortAudio" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\include;..\..\src\common" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PORTAUDIO_EXPORTS;PA_NO_ASIO;PA_NO_DS;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + DisableSpecificWarnings="4305;4133;4267;4244;4311" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + ModuleDefinitionFile="portaudio.def" + GenerateDebugInformation="true" + SubSystem="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\include;..\..\src\common" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PORTAUDIO_EXPORTS;_CRT_SECURE_NO_DEPRECATE;PA_NO_ASIO;PA_NO_DS" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + DisableSpecificWarnings="4305;4133;4267;4244;4311" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + ModuleDefinitionFile="portaudio.def" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="PortAudio HostAPI" + > + <File + RelativePath="..\..\src\hostapi\wmme\pa_win_wmme.c" + > + </File> + </Filter> + <Filter + Name="PortAudio OS" + > + <File + RelativePath="..\..\src\os\win\pa_win_hostapis.c" + > + </File> + <File + RelativePath="..\..\src\os\win\pa_win_util.c" + > + </File> + <File + RelativePath="..\..\src\os\win\pa_x86_plain_converters.c" + > + </File> + <File + RelativePath="..\..\src\os\win\pa_x86_plain_converters.h" + > + </File> + </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> + <Filter + Name="PortAudio Common" + > + <File + RelativePath="..\..\src\common\pa_allocation.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_allocation.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_converters.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_converters.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_cpuload.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_cpuload.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_dither.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_dither.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_endianness.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_front.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_hostapi.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_process.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_process.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_skeleton.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_stream.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_stream.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_trace.c" + > + </File> + <File + RelativePath="..\..\src\common\pa_trace.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_types.h" + > + </File> + <File + RelativePath="..\..\src\common\pa_util.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/trunk/w32/vsnet/Tools/PortAudio/portaudio.def ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/vsnet/Tools/PortAudio/portaudio.def Mon Aug 7 15:28:27 2006 @@ -0,0 +1,39 @@ +LIBRARY portaudio.dll +EXPORTS + +; +Pa_GetVersion @1 +Pa_GetVersionText @2 +Pa_GetErrorText @3 +Pa_Initialize @4 +Pa_Terminate @5 +Pa_GetHostApiCount @6 +Pa_GetDefaultHostApi @7 +Pa_GetHostApiInfo @8 +Pa_HostApiTypeIdToHostApiIndex @9 +Pa_HostApiDeviceIndexToDeviceIndex @10 +Pa_GetLastHostErrorInfo @11 +Pa_GetDeviceCount @12 +Pa_GetDefaultInputDevice @13 +Pa_GetDefaultOutputDevice @14 +Pa_GetDeviceInfo @15 +Pa_IsFormatSupported @16 +Pa_OpenStream @17 +Pa_OpenDefaultStream @18 +Pa_CloseStream @19 +Pa_SetStreamFinishedCallback @20 +Pa_StartStream @21 +Pa_StopStream @22 +Pa_AbortStream @23 +Pa_IsStreamStopped @24 +Pa_IsStreamActive @25 +Pa_GetStreamInfo @26 +Pa_GetStreamTime @27 +Pa_GetStreamCpuLoad @28 +Pa_ReadStream @29 +Pa_WriteStream @30 +Pa_GetStreamReadAvailable @31 +Pa_GetStreamWriteAvailable @32 +Pa_GetSampleSize @33 +Pa_Sleep @34 +PaUtil_InitializeX86PlainConverters @52

1 0

[commit] r2232 - freeswitch/trunk/mac/xcode
by Freeswitch SVN 07 Aug '06

07 Aug '06

Author: brian Date: Mon Aug 7 13:10:02 2006 New Revision: 2232 Added: freeswitch/trunk/mac/xcode/Loadable Bundle.trgttmpl Log: This is required to build loadable bundles. Drop this into your /Library/Application Support/Apple/Developer Tools/Target Templates/BSD/Loadable Bundle.trgttmpl Restart XCode Added: freeswitch/trunk/mac/xcode/Loadable Bundle.trgttmpl ============================================================================== --- (empty file) +++ freeswitch/trunk/mac/xcode/Loadable Bundle.trgttmpl Mon Aug 7 13:10:02 2006 @@ -0,0 +1,24 @@ +{ + Class = Native; + ProductType = "com.apple.product-type.objfile"; + Description = "Target for building a laodable bundle without a bundle wrapper."; + CustomBuildSettings = { + MACH_O_TYPE = "mh_bundle"; + INSTALL_PATH = "/usr/local/lib"; + PRODUCT_NAME = "«PRODUCTNAME»"; + PREBINDING = NO; + GCC_MODEL_TUNING = G5; + OTHER_LDFLAGS = "-undefined dynamic_lookup"; + EXECUTABLE_PREFIX = ""; + EXECUTABLE_EXTENSION = "dylib"; + KEEP_PRIVATE_EXTERNS = NO; + }; + BuildPhases = ( + { + Class = Sources; + }, + { + Class = Frameworks; + }, + ); +}

1 0

[commit] r2231 - freeswitch/trunk/w32/vsnet
by Freeswitch SVN 07 Aug '06

07 Aug '06

Author: mikej Date: Mon Aug 7 12:25:46 2006 New Revision: 2231 Modified: freeswitch/trunk/w32/vsnet/GetLibs.vbs Log: Fix clean build on windows, and hack when using 1.4 svn to still build. Modified: freeswitch/trunk/w32/vsnet/GetLibs.vbs ============================================================================== --- freeswitch/trunk/w32/vsnet/GetLibs.vbs (original) +++ freeswitch/trunk/w32/vsnet/GetLibs.vbs Mon Aug 7 12:25:46 2006 @@ -175,6 +175,8 @@ BuildLibs_srtp BuildDebug, BuildRelease FSO.CopyFile LibDestDir & "srtp\include\*.h", LibDestDir & "include" FSO.CopyFile LibDestDir & "srtp\crypto\include\*.h", LibDestDir & "include" + BuildLibs_pcre BuildDebug, BuildRelease + FSO.CopyFile LibDestDir & "pcre\win32\pcre.h", LibDestDir & "include" End If If BuildModXMLRpc Then @@ -251,10 +253,10 @@ If Not FSO.FolderExists(LibDestDir & "apr-util") Then Wscript.echo "Unable to get apr-util from default download location, Trying backup location:" WgetUnCompress LibsBase & "apr-util-1.2.7.tar.gz", LibDestDir + RenameFolder LibDestDir & "apr-util-1.2.7", "apr-util" + FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True + FSO.CopyFile Utilsdir & "apr\libaprutil.vcproj", LibDestDir & "apr-util\", True End If - RenameFolder LibDestDir & "apr-util-1.2.7", "apr-util" - FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True - FSO.CopyFile Utilsdir & "apr\libaprutil.vcproj", LibDestDir & "apr-util\", True If FSO.FolderExists(LibDestDir & "apr-util") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\LibD\xml.lib") Then @@ -282,12 +284,12 @@ End Sub Sub BuildLibs_apriconv(BuildDebug, BuildRelease) - If Not FSO.FolderExists(LibDestDir & "apr-iconv-1.1.1") Then + If Not FSO.FolderExists(LibDestDir & "apr-iconv") Then Wscript.echo "Unable to get apr-iconv from default download location, Trying backup location:" WgetUnCompress LibsBase & "apr-iconv-1.1.1.tar.gz", LibDestDir + RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv" + FSO.CopyFile Utilsdir & "apr\libapriconv.vcproj", LibDestDir & "apr-iconv\", True End If - RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv" - FSO.CopyFile Utilsdir & "apr\libapriconv.vcproj", LibDestDir & "apr-iconv\", True If FSO.FolderExists(LibDestDir & "apr-iconv") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "apr-iconv\Debug\libapriconv-1.lib") Then @@ -312,10 +314,10 @@ If Not FSO.FolderExists(LibDestDir & "apr") Then Wscript.echo "Unable to get apr from default download location, Trying backup location:" WgetUnCompress LibsBase & "apr-1.2.7.tar.gz", LibDestDir + RenameFolder LibDestDir & "apr-1.2.7", "apr" + FSO.CopyFile Utilsdir & "apr\libapr.vcproj", LibDestDir & "apr\", True + FSO.CopyFile Utilsdir & "apr\apr.hw", LibDestDir & "apr\include\", True End If - RenameFolder LibDestDir & "apr-1.2.7", "apr" - FSO.CopyFile Utilsdir & "apr\libapr.vcproj", LibDestDir & "apr\", True - FSO.CopyFile Utilsdir & "apr\apr.hw", LibDestDir & "apr\include\", True If FSO.FolderExists(LibDestDir & "apr") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "apr\Debug\libapr-1.lib") Then @@ -415,10 +417,10 @@ If Not FSO.FolderExists(LibDestDir & "sqlite") Then Wscript.echo "Unable to get SQLite from default download location, Trying backup location:" WgetUnCompress LibsBase & "sqlite-source-3_3_6.zip", LibDestDir + RenameFolder LibDestDir & "sqlite-source-3_3_6", "sqlite" + FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True + FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;" End If - RenameFolder LibDestDir & "sqlite-source-3_3_6", "sqlite" - FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True - FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;" If FSO.FolderExists(LibDestDir & "sqlite") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "sqlite\Debug DLL\sqlite.lib") Then @@ -916,6 +918,16 @@ FSO.CopyFile FreeswitchDir & "src\include\switch_version.h.in", FreeswitchDir & "src\include\switch_version.h", true FindReplaceInFile FreeswitchDir & "src\include\switch_version.h", "@SVN_VERSION@", VERSION End If + If VERSION = "" Then + VERSION = "UNKNOWN" + Set MyFile = fso.CreateTextFile(UtilsDir & "lastversion", True) + MyFile.WriteLine(VERSION) + MyFile.Close + + FSO.CopyFile FreeswitchDir & "src\include\switch_version.h.in", FreeswitchDir & "src\include\switch_version.h", true + FindReplaceInFile FreeswitchDir & "src\include\switch_version.h", "@SVN_VERSION@", VERSION + End If + End Sub Sub BuildViaVCBuild(ProjectFile, BuildType) @@ -973,6 +985,7 @@ End Sub Sub RenameFolder(FolderName, NewFolderName) + wscript.echo FolderName Set Folder=FSO.GetFolder(FolderName) Folder.Name = NewFolderName End Sub

1 0

[commit] r2230 - freeswitch/branches/fanzhou
by Freeswitch SVN 07 Aug '06

07 Aug '06

Author: sphere Date: Sun Aug 6 23:01:19 2006 New Revision: 2230 Added: freeswitch/branches/fanzhou/ Log: Creating empty folder for fanzhou

1 0

[commit] r2229 - freeswitch/branches/jaime3651
by Freeswitch SVN 04 Aug '06

04 Aug '06

Author: sphere Date: Fri Aug 4 12:08:21 2006 New Revision: 2229 Added: freeswitch/branches/jaime3651/ Log: Creating empty folder for jaime3651

1 0

[commit] r2228 - freeswitch/branches/jvp
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Thu Aug 3 14:55:16 2006 New Revision: 2228 Added: freeswitch/branches/jvp/ Log: Creating empty folder for jvp

1 0

[commit] r2227 - freeswitch/branches/breakdisk
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Thu Aug 3 14:49:22 2006 New Revision: 2227 Added: freeswitch/branches/breakdisk/ Log: Creating empty folder for breakdisk

1 0

[commit] r2226 - freeswitch/branches/stpeter
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Thu Aug 3 14:48:19 2006 New Revision: 2226 Added: freeswitch/branches/stpeter/ Log: Creating empty folder for stpeter

1 0

[commit] r2225 - freeswitch/branches/joshaidan
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Thu Aug 3 09:56:15 2006 New Revision: 2225 Added: freeswitch/branches/joshaidan/ Log: Creating empty folder for joshaidan

1 0