- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5996 - freeswitch/trunk/w32
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: mikej Date: Fri Oct 19 12:11:52 2007 New Revision: 5996 Modified: freeswitch/trunk/w32/curl.vsprops freeswitch/trunk/w32/module_debug.vsprops freeswitch/trunk/w32/spidermonkey.vsprops Log: missing settings. Modified: freeswitch/trunk/w32/curl.vsprops ============================================================================== --- freeswitch/trunk/w32/curl.vsprops (original) +++ freeswitch/trunk/w32/curl.vsprops Fri Oct 19 12:11:52 2007 @@ -1,7 +1,12 @@ -<?xml version="1.0"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" Name="curl" > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(SolutionDir)libs\curl\include" + PreprocessorDefinitions="HAVE_CURL;CURL_STATICLIB" + /> </VisualStudioPropertySheet> Modified: freeswitch/trunk/w32/module_debug.vsprops ============================================================================== --- freeswitch/trunk/w32/module_debug.vsprops (original) +++ freeswitch/trunk/w32/module_debug.vsprops Fri Oct 19 12:11:52 2007 @@ -8,7 +8,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="_DEBUG;DEBUG" BasicRuntimeChecks="3" RuntimeLibrary="3" DebugInformationFormat="3" Modified: freeswitch/trunk/w32/spidermonkey.vsprops ============================================================================== --- freeswitch/trunk/w32/spidermonkey.vsprops (original) +++ freeswitch/trunk/w32/spidermonkey.vsprops Fri Oct 19 12:11:52 2007 @@ -1,7 +1,17 @@ -<?xml version="1.0"?> -<VisualStudioPropertySheet - ProjectType="Visual C++" - Version="8.00" +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" Name="spidermonkey" + InheritedPropertySheets=".\curl.vsprops" > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(SolutionDir)libs\js\src";"$(SolutionDir)libs\js\nsprpub\pr\include";"$(SolutionDir)src\mod\languages\mod_spidermonkey"" + PreprocessorDefinitions="XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;JS_THREADSAFE" + /> + <Tool + Name="VCLinkerTool" + AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" + /> </VisualStudioPropertySheet>

1 0

[commit] r5995 - in freeswitch/trunk: src/mod/languages/mod_spidermonkey src/mod/languages/mod_spidermonkey_core_db src/mod/languages/mod_spidermonkey_etpan src/mod/languages/mod_spidermonkey_odbc src/mod/languages/mod_spidermonkey_socket src/mod/languages/mod_spidermonkey_teletone src/mod/xml_int/mod_xml_cdr src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc w32 w32/Console w32/Library
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: mikej Date: Fri Oct 19 12:09:14 2007 New Revision: 5995 Added: freeswitch/trunk/w32/curl.vsprops freeswitch/trunk/w32/spidermonkey.vsprops Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: use vsprops files for spidermonkey modules and modules using curl to centralize those settings. Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj Fri Oct 19 12:09:14 2007 @@ -18,40 +18,36 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include"" - PreprocessorDefinitions="XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1" UsePrecompiledHeader="0" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" + AdditionalLibraryDirectories="" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\curl\include";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include"" - PreprocessorDefinitions="XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;SM_EXPORTS;JS_HAS_FILE_OBJECT=1" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="SM_EXPORTS;JS_HAS_FILE_OBJECT=1" UsePrecompiledHeader="0" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" + AdditionalLibraryDirectories="" /> </Configuration> </Configurations> Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj Fri Oct 19 12:09:14 2007 @@ -17,10 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool @@ -41,37 +39,18 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_spidermonkey_core_db.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool @@ -92,30 +71,12 @@ /> <Tool Name="VCCLCompilerTool" - WholeProgramOptimization="true" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" - RuntimeLibrary="2" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" - ImportLibrary="$(OutDir)/mod_spidermonkey_core_db.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> </Configuration> </Configurations> Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj Fri Oct 19 12:09:14 2007 @@ -17,10 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool @@ -41,37 +39,18 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libetpan\build-windows\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libetpan\build-windows\include"" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_spidermonkey_etpan.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool @@ -92,30 +71,12 @@ /> <Tool Name="VCCLCompilerTool" - WholeProgramOptimization="true" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libetpan\build-windows\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libetpan\build-windows\include"" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - LinkTimeCodeGeneration="1" - ImportLibrary="$(OutDir)/mod_spidermonkey_etpan.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> </Configuration> </Configurations> Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj Fri Oct 19 12:09:14 2007 @@ -17,10 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool @@ -41,37 +39,18 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_spidermonkey_odbc.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool @@ -93,29 +72,16 @@ <Tool Name="VCCLCompilerTool" WholeProgramOptimization="true" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" + AdditionalIncludeDirectories="" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" + AdditionalLibraryDirectories="" OptimizeReferences="2" EnableCOMDATFolding="2" LinkTimeCodeGeneration="1" - ImportLibrary="$(OutDir)/mod_spidermonkey_odbc.lib" - TargetMachine="1" /> </Configuration> </Configurations> Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj Fri Oct 19 12:09:14 2007 @@ -17,10 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="1" > <Tool @@ -40,37 +38,19 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" AdditionalOptions=""..\..\..\..\libs\win32\js\debug\js32.lib" "..\..\..\..\libs\win32\apr\debug\libapr-1.lib" "..\..\..\..\w32\library\debug\freeswitchcore.lib" "..\..\..\..\libs\win32\debug\libetpan.lib" "..\mod_spidermonkey\debug\mod_spidermonkey.lib"" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_spidermonkey_socket.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="1" WholeProgramOptimization="1" > @@ -91,22 +71,11 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE;MOD_SPIDERMONKEY_SOCKET_EXPORTS" - RuntimeLibrary="2" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" - WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" /> </Configuration> </Configurations> Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj Fri Oct 19 12:09:14 2007 @@ -17,10 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool @@ -41,37 +39,18 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libteletone\src"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;DEBUG;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libteletone\src"" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" - ImportLibrary="$(OutDir)/mod_spidermonkey_teletone.lib" - TargetMachine="1" + AdditionalLibraryDirectories="" /> </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" > <Tool @@ -92,30 +71,15 @@ /> <Tool Name="VCCLCompilerTool" - WholeProgramOptimization="true" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\js\src";"$(InputDir)..\..\..\..\libs\js\nsprpub\pr\include";"$(InputDir)..\mod_spidermonkey";"$(InputDir)..\..\..\..\libs\libteletone\src"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;XP_WIN;_X86_=1;JSFILE;EXPORT_JS_API;HAVE_CURL;CURL_STATICLIB;JS_THREADSAFE" - RuntimeLibrary="2" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\libteletone\src"" UsePrecompiledHeader="0" - WarningLevel="4" - WarnAsError="true" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" /> <Tool Name="VCLinkerTool" - LinkLibraryDependencies="true" - OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" - SubSystem="2" + AdditionalLibraryDirectories="" OptimizeReferences="2" EnableCOMDATFolding="2" LinkTimeCodeGeneration="1" - ImportLibrary="$(OutDir)/mod_spidermonkey_teletone.lib" - TargetMachine="1" /> </Configuration> </Configurations> Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj Fri Oct 19 12:09:14 2007 @@ -18,13 +18,12 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="CURL_STATICLIB" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" /> <Tool @@ -34,13 +33,12 @@ <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="CURL_STATICLIB" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" /> <Tool Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Fri Oct 19 12:09:14 2007 @@ -18,35 +18,33 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" /> <Tool Name="VCLinkerTool" - AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" + AdditionalLibraryDirectories="" /> </Configuration> <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="CURL_STATICLIB" + AdditionalIncludeDirectories="" UsePrecompiledHeader="0" /> <Tool Name="VCLinkerTool" - AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" + AdditionalLibraryDirectories="" /> </Configuration> </Configurations> Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Fri Oct 19 12:09:14 2007 @@ -18,13 +18,13 @@ <Configuration Name="Debug|Win32" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c"" + PreprocessorDefinitions="ABYSS_WIN32" UsePrecompiledHeader="0" /> <Tool @@ -35,13 +35,13 @@ <Configuration Name="Release|Win32" ConfigurationType="2" - InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" - PreprocessorDefinitions="ABYSS_WIN32;CURL_STATICLIB" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c"" + PreprocessorDefinitions="ABYSS_WIN32" UsePrecompiledHeader="0" /> <Tool Modified: freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj ============================================================================== --- freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj (original) +++ freeswitch/trunk/w32/Console/FreeSwitchConsole.vcproj Fri Oct 19 12:09:14 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" + InheritedPropertySheets="..\winlibs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > @@ -63,7 +64,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="advapi32.lib" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" LinkIncremental="1" AdditionalLibraryDirectories="$(OutDir)" @@ -102,6 +102,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" + InheritedPropertySheets="..\winlibs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > @@ -142,7 +143,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="advapi32.lib" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.exe" LinkIncremental="1" AdditionalLibraryDirectories="$(OutDir)" Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Fri Oct 19 12:09:14 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\winlibs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > @@ -69,7 +70,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" LinkIncremental="1" AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" @@ -113,6 +113,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\winlibs.vsprops" CharacterSet="2" BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > @@ -159,7 +160,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="Ws2_32.lib Mswsock.lib Rpcrt4.lib" OutputFile="$(SolutionDir)$(ConfigurationName)/FreeSwitch.dll" LinkIncremental="1" AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" @@ -477,11 +477,11 @@ > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File Added: freeswitch/trunk/w32/curl.vsprops ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/curl.vsprops Fri Oct 19 12:09:14 2007 @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="curl" + > +</VisualStudioPropertySheet> Added: freeswitch/trunk/w32/spidermonkey.vsprops ============================================================================== --- (empty file) +++ freeswitch/trunk/w32/spidermonkey.vsprops Fri Oct 19 12:09:14 2007 @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="spidermonkey" + > +</VisualStudioPropertySheet>

1 0

[commit] r5994 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: anthm Date: Fri Oct 19 12:02:44 2007 New Revision: 5994 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: urldecode the uri Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Oct 19 12:02:44 2007 @@ -1760,6 +1760,17 @@ return; } +#define check_decode(_var, _session) do { \ + assert(_session); \ + if (strchr(_var, '%')) { \ + char *tmp = switch_core_session_strdup(_session, _var); \ + switch_url_decode(tmp); \ + _var = tmp; \ + } \ + if(_session) break; \ + } while(!_session) + + #define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, #varprefix "_user", #varprefix "_host", #varprefix "_port", #varprefix "_uri") const char *_url_set_chanvars(switch_core_session_t *session, url_t *url, const char *user_var, const char *host_var, const char *port_var, const char *uri_var) @@ -1774,6 +1785,8 @@ port = url->url_port; } + check_decode(user, session); + if (user) { switch_channel_set_variable(channel, user_var, user); } @@ -1853,7 +1866,7 @@ } } } - free(mydata); + free(mydata); } } } @@ -1944,9 +1957,12 @@ from_host = sip->sip_from->a_url->url_host; channel_name = url_set_chanvars(session, sip->sip_from->a_url, sip_from); - switch_channel_set_variable(channel, "sip_mailbox", from_user); - + check_decode(from_user, session); + + if (!switch_strlen_zero(from_user)) { + switch_channel_set_variable(channel, "sip_mailbox", from_user); + if (*from_user == '+') { switch_channel_set_variable(channel, "sip_from_user_stripped", (const char *) (from_user + 1)); } else { @@ -1980,6 +1996,7 @@ } else { destination_number = sip->sip_request->rq_url->url_user; } + check_decode(destination_number, session); } if (sip->sip_to && sip->sip_to->a_url) { @@ -2044,8 +2061,10 @@ if (sip->sip_request->rq_url) { sofia_gateway_t *gateway; + char *user = (char *) sip->sip_request->rq_url->url_user; + check_decode(user, session); char *from_key = switch_core_session_sprintf(session, "sip:%s@%s", - (char *) sip->sip_request->rq_url->url_user, + user, (char *) sip->sip_request->rq_url->url_host); if ((gateway = sofia_reg_find_gateway(from_key))) {

1 0

[commit] r5993 - freeswitch/trunk/conf
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: brian Date: Fri Oct 19 11:55:40 2007 New Revision: 5993 Modified: freeswitch/trunk/conf/default_context.xml Log: add these nice gems to the default config Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Fri Oct 19 11:55:40 2007 @@ -37,7 +37,20 @@ <action application="bridge" data="iax/guest(a)conference.freeswitch.org/888"/> </condition> </extension> - + + <extension name="static-park"> + <condition field="destination_number" expression="^8192$"> + <action application="fifo" data="default in undef /ram/swimp.raw"/> + </condition> + </extension> + + <extension name="unpark"> + <condition field="destination_number" expression="^8193$"> + <action application="answer"/> + <action application="fifo" data="default out nowait"/> + </condition> + </extension> + <!-- if the number starts with a *393 then strip the *393 and dial the remainder of the number out our "fwd" gateway

1 0

[commit] r5992 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/applications/mod_ivrtest mod/codecs/mod_speex mod/endpoints/mod_alsa mod/endpoints/mod_portaudio mod/languages/mod_spidermonkey mod/languages/mod_spidermonkey_teletone
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: anthm Date: Fri Oct 19 11:31:02 2007 New Revision: 5992 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Oct 19 11:31:02 2007 @@ -4224,7 +4224,7 @@ } if (read_codec->implementation->actual_samples_per_second != conference->rate) { - switch_audio_resampler_t **resampler = read_codec->implementation->samples_per_second > conference->rate ? + switch_audio_resampler_t **resampler = read_codec->implementation->actual_samples_per_second > conference->rate ? &member.read_resampler : &member.mux_resampler; if (switch_resample_create(resampler, Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Fri Oct 19 11:31:02 2007 @@ -291,7 +291,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, - read_codec->implementation->samples_per_second, + ah.rate, read_codec->implementation->number_of_channels, read_codec->implementation->microseconds_per_frame / 1000); switch_core_session_reset(session); return; Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Fri Oct 19 11:31:02 2007 @@ -93,11 +93,11 @@ const SpeexMode *mode = NULL; context->codec = codec; - if (codec->implementation->samples_per_second == 8000) { + if (codec->implementation->actual_samples_per_second == 8000) { mode = &speex_nb_mode; - } else if (codec->implementation->samples_per_second == 16000) { + } else if (codec->implementation->actual_samples_per_second == 16000) { mode = &speex_wb_mode; - } else if (codec->implementation->samples_per_second == 32000) { + } else if (codec->implementation->actual_samples_per_second == 32000) { mode = &speex_uwb_mode; } @@ -111,7 +111,7 @@ speex_encoder_ctl(context->encoder_state, SPEEX_GET_FRAME_SIZE, &context->encoder_frame_size); speex_encoder_ctl(context->encoder_state, SPEEX_SET_COMPLEXITY, &codec->codec_settings.complexity); if (codec->codec_settings.preproc) { - context->pp = speex_preprocess_state_init(context->encoder_frame_size, codec->implementation->samples_per_second); + context->pp = speex_preprocess_state_init(context->encoder_frame_size, codec->implementation->actual_samples_per_second); speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_VAD, &codec->codec_settings.pp_vad); speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_AGC, &codec->codec_settings.pp_agc); speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_AGC_LEVEL, &codec->codec_settings.pp_agc_level); Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Fri Oct 19 11:31:02 2007 @@ -223,7 +223,7 @@ if (switch_core_file_open(&fh, ring_file, globals.read_codec.implementation->number_of_channels, - globals.read_codec.implementation->samples_per_second, + globals.read_codec.implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) { if (engage_device(fh.samplerate, fh.channels) != SWITCH_STATUS_SUCCESS) { @@ -582,7 +582,7 @@ if (switch_core_file_open(&tech_pvt->fh, tech_pvt->hold_file, globals.read_codec.implementation->number_of_channels, - globals.read_codec.implementation->samples_per_second, + globals.read_codec.implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { switch_core_codec_destroy(&tech_pvt->write_codec); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Oct 19 11:31:02 2007 @@ -223,7 +223,7 @@ if (switch_core_file_open(&fh, ring_file, globals.read_codec.implementation->number_of_channels, - globals.read_codec.implementation->samples_per_second, + globals.read_codec.implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) == SWITCH_STATUS_SUCCESS) { if (engage_ring_device(fh.samplerate, fh.channels) != SWITCH_STATUS_SUCCESS) { @@ -568,7 +568,7 @@ if (switch_core_file_open(&tech_pvt->fh, tech_pvt->hold_file, globals.read_codec.implementation->number_of_channels, - globals.read_codec.implementation->samples_per_second, + globals.read_codec.implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { tech_pvt->hold_file = NULL; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri Oct 19 11:31:02 2007 @@ -1116,14 +1116,14 @@ step = 1000; } if (step > 0) { - samps = step * (codec->implementation->samples_per_second / 1000); + samps = step * (codec->implementation->actual_samples_per_second / 1000); switch_core_file_seek(fh, &pos, samps, SEEK_CUR); } else { - samps = step * (codec->implementation->samples_per_second / 1000); + samps = step * (codec->implementation->actual_samples_per_second / 1000); switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET); } } else { - samps = atoi(p) * (codec->implementation->samples_per_second / 1000); + samps = atoi(p) * (codec->implementation->actual_samples_per_second / 1000); switch_core_file_seek(fh, &pos, samps, SEEK_SET); } } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Fri Oct 19 11:31:02 2007 @@ -112,7 +112,7 @@ if (switch_core_codec_init(&tto->codec, "L16", NULL, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, read_codec->implementation->number_of_channels, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, pool) == SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Oct 19 11:31:02 2007 @@ -780,12 +780,12 @@ if ((codec = switch_core_session_get_read_codec(channel->session)) && codec->implementation) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Name", "%s", switch_str_nil(codec->implementation->iananame)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Rate", "%u", codec->implementation->samples_per_second); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Rate", "%u", codec->implementation->actual_samples_per_second); } if ((codec = switch_core_session_get_write_codec(channel->session)) && codec->implementation) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Name", "%s", switch_str_nil(codec->implementation->iananame)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Rate", "%u", codec->implementation->samples_per_second); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Rate", "%u", codec->implementation->actual_samples_per_second); } /* Index Caller's Profile */ Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Fri Oct 19 11:31:02 2007 @@ -44,6 +44,7 @@ switch_channel_event_set_data(session->channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", "%s", codec->implementation->iananame); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", codec->implementation->samples_per_second); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-actual-read-codec-rate", "%d", codec->implementation->actual_samples_per_second); switch_event_fire(&event); } @@ -70,6 +71,7 @@ switch_channel_event_set_data(session->channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", "%s", codec->implementation->iananame); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", codec->implementation->samples_per_second); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-actual-write-codec-rate", "%d", codec->implementation->actual_samples_per_second); switch_event_fire(&event); } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Oct 19 11:31:02 2007 @@ -167,7 +167,7 @@ session->read_codec, read_frame->data, read_frame->datalen, - session->read_codec->implementation->samples_per_second, + session->read_codec->implementation->actual_samples_per_second, session->raw_read_frame.data, &session->raw_read_frame.datalen, &session->raw_read_frame.rate, &flag); if (do_resample && status == SWITCH_STATUS_SUCCESS) { @@ -304,7 +304,7 @@ session->raw_read_frame.data, session->read_codec->implementation->bytes_per_frame); - session->raw_read_frame.rate = session->read_codec->implementation->samples_per_second; + session->raw_read_frame.rate = session->read_codec->implementation->actual_samples_per_second; enc_frame = &session->raw_read_frame; } session->enc_read_frame.datalen = session->enc_read_frame.buflen; @@ -317,7 +317,7 @@ enc_frame->codec, enc_frame->data, enc_frame->datalen, - session->read_codec->implementation->samples_per_second, + session->read_codec->implementation->actual_samples_per_second, session->enc_read_frame.data, &session->enc_read_frame.datalen, &session->enc_read_frame.rate, &flag); @@ -443,7 +443,7 @@ session->write_codec, frame->data, frame->datalen, - session->write_codec->implementation->samples_per_second, + session->write_codec->implementation->actual_samples_per_second, session->raw_write_frame.data, &session->raw_write_frame.datalen, &session->raw_write_frame.rate, &flag); @@ -597,7 +597,7 @@ frame->codec, enc_frame->data, enc_frame->datalen, - session->write_codec->implementation->samples_per_second, + session->write_codec->implementation->actual_samples_per_second, session->enc_write_frame.data, &session->enc_write_frame.datalen, &session->enc_write_frame.rate, &flag); switch (status) { @@ -650,13 +650,13 @@ switch_buffer_read(session->raw_write_buffer, session->raw_write_frame.data, bytes)) != 0) { int rate; enc_frame = &session->raw_write_frame; - session->raw_write_frame.rate = session->write_codec->implementation->samples_per_second; + session->raw_write_frame.rate = session->write_codec->implementation->actual_samples_per_second; session->enc_write_frame.datalen = session->enc_write_frame.buflen; if (frame->codec && frame->codec->implementation) { - rate = frame->codec->implementation->samples_per_second; + rate = frame->codec->implementation->actual_samples_per_second; } else { - rate = session->write_codec->implementation->samples_per_second; + rate = session->write_codec->implementation->actual_samples_per_second; } status = switch_core_codec_encode(session->write_codec, Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Fri Oct 19 11:31:02 2007 @@ -160,7 +160,7 @@ frame->datalen = bytes; frame->samples = bytes / sizeof(int16_t); - frame->rate = read_codec->implementation->samples_per_second; + frame->rate = read_codec->implementation->actual_samples_per_second; return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Oct 19 11:31:02 2007 @@ -202,16 +202,16 @@ if (switch_core_codec_init(&conninfo->read_codec, "L16", NULL, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); goto fail; } } @@ -445,7 +445,7 @@ switch_size_t len = 0; uint32_t flags = 0; switch_byte_t decoded[SWITCH_RECOMMENDED_BUFFER_SIZE]; - uint32_t rate = read_codec->implementation->samples_per_second; + uint32_t rate = read_codec->implementation->actual_samples_per_second; uint32_t dlen = sizeof(decoded); switch_status_t status; switch_byte_t *sendbuf = NULL; @@ -465,7 +465,7 @@ &conninfo->read_codec, read_frame->data, read_frame->datalen, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, decoded, &dlen, &rate, &flags); } switch (status) { Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Oct 19 11:31:02 2007 @@ -207,13 +207,13 @@ assert(read_codec != NULL); dh->fh.channels = read_codec->implementation->number_of_channels; - dh->fh.samplerate = read_codec->implementation->samples_per_second; + dh->fh.samplerate = read_codec->implementation->actual_samples_per_second; if (switch_core_file_open(&dh->fh, file, read_codec->implementation->number_of_channels, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -329,13 +329,13 @@ } fh->channels = channels; - fh->samplerate = read_codec->implementation->samples_per_second; + fh->samplerate = read_codec->implementation->actual_samples_per_second; if (switch_core_file_open(fh, file, channels, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", file); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); @@ -470,7 +470,7 @@ return SWITCH_STATUS_MEMERR; } - teletone_dtmf_detect_init(&pvt->dtmf_detect, read_codec->implementation->samples_per_second); + teletone_dtmf_detect_init(&pvt->dtmf_detect, read_codec->implementation->actual_samples_per_second); pvt->session = session; @@ -668,7 +668,7 @@ } cont->list[cont->index].up = 1; - cont->list[cont->index].mt.sample_rate = read_codec->implementation->samples_per_second; + cont->list[cont->index].mt.sample_rate = read_codec->implementation->actual_samples_per_second; teletone_multi_tone_init(&cont->list[cont->index].mt, &cont->list[cont->index].map); cont->session = session; @@ -952,7 +952,7 @@ if (switch_core_asr_open(ah, mod_name, "L16", - read_codec->implementation->samples_per_second, dest, &flags, + read_codec->implementation->actual_samples_per_second, dest, &flags, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { if (switch_core_asr_load_grammar(ah, grammar, path) != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Oct 19 11:31:02 2007 @@ -615,7 +615,7 @@ if (switch_core_codec_init(&write_codec, "L16", NULL, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { @@ -623,7 +623,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); write_frame.codec = &write_codec; write_frame.datalen = read_codec->implementation->bytes_per_frame; write_frame.samples = write_frame.datalen / 2; @@ -652,11 +652,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback File [%s]\n", ringback_data); ringback.fhb.channels = read_codec->implementation->number_of_channels; - ringback.fhb.samplerate = read_codec->implementation->samples_per_second; + ringback.fhb.samplerate = read_codec->implementation->actual_samples_per_second; if (switch_core_file_open(&ringback.fhb, ringback_data, read_codec->implementation->number_of_channels, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Playing File\n"); @@ -668,7 +668,7 @@ } else { teletone_init_session(&ringback.ts, 0, teletone_handler, &ringback); - ringback.ts.rate = read_codec->implementation->samples_per_second; + ringback.ts.rate = read_codec->implementation->actual_samples_per_second; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback Tone [%s]\n", ringback_data); //ringback.ts.debug = 1; //ringback.ts.debug_stream = switch_core_get_console(); Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri Oct 19 11:31:02 2007 @@ -341,13 +341,13 @@ assert(read_codec != NULL); fh->channels = read_codec->implementation->number_of_channels; - fh->samplerate = read_codec->implementation->samples_per_second; + fh->samplerate = read_codec->implementation->actual_samples_per_second; if (switch_core_file_open(fh, file, read_codec->implementation->number_of_channels, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_core_session_reset(session); @@ -396,7 +396,7 @@ if (switch_core_codec_init(&codec, codec_name, NULL, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, read_codec->implementation->number_of_channels, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, @@ -563,7 +563,7 @@ if (switch_core_codec_init(&write_codec, "L16", NULL, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { @@ -576,7 +576,7 @@ switch_buffer_create_dynamic(&audio_buffer, 512, 1024, 0); teletone_init_session(&ts, 0, teletone_handler, audio_buffer); - ts.rate = read_codec->implementation->samples_per_second; + ts.rate = read_codec->implementation->actual_samples_per_second; ts.channels = 1; teletone_run(&ts, script); @@ -722,7 +722,7 @@ if (switch_core_file_open(fh, file, read_codec->implementation->number_of_channels, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_core_session_reset(session); return SWITCH_STATUS_NOTFOUND; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Fri Oct 19 11:31:02 2007 @@ -163,7 +163,7 @@ for (impl = ptr->implementations; impl; impl = impl->next) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding Codec '%s' (%s) %dhz %dms\n", - impl->iananame, ptr->interface_name, impl->samples_per_second, impl->microseconds_per_frame / 1000); + impl->iananame, ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_frame / 1000); if (!switch_core_hash_find(loadable_modules.codec_hash, impl->iananame)) { switch_core_hash_insert(loadable_modules.codec_hash, impl->iananame, (const void *) ptr); } @@ -429,7 +429,7 @@ for (impl = ptr->implementations; impl; impl = impl->next) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleting Codec '%s' (%s) %dhz %dms\n", - impl->iananame, ptr->interface_name, impl->samples_per_second, impl->microseconds_per_frame / 1000); + impl->iananame, ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_frame / 1000); if (switch_core_hash_find(loadable_modules.codec_hash, impl->iananame)) { switch_core_hash_delete(loadable_modules.codec_hash, impl->iananame); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Oct 19 11:31:02 2007 @@ -1343,7 +1343,7 @@ rtp_session->vad_data.read_codec, data, datalen, - rtp_session->vad_data.read_codec->implementation->samples_per_second, + rtp_session->vad_data.read_codec->implementation->actual_samples_per_second, decoded, &len, &rate, &flags) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r5991 - in freeswitch/trunk: src/mod/applications/mod_esf src/mod/directories/mod_ldap src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_iax src/mod/endpoints/mod_portaudio src/mod/event_handlers/mod_zeroconf src/mod/languages/mod_spidermonkey_core_db src/mod/languages/mod_spidermonkey_etpan src/mod/languages/mod_spidermonkey_odbc src/mod/languages/mod_spidermonkey_socket src/mod/languages/mod_spidermonkey_teletone src/mod/xml_int/mod_xml_cdr src/mod/xml_int/mod_xml_curl src/mo
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: mikej Date: Fri Oct 19 02:44:27 2007 New Revision: 5991 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.vcproj freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj freeswitch/trunk/w32/modules.vsprops freeswitch/trunk/w32/winlibs.vsprops Log: use winlibs.vsprops to include the windows system libs, so that we will work on incorrectly configured visual studio express edition better. Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.vcproj Fri Oct 19 02:44:27 2007 @@ -25,10 +25,6 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0" /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib " - /> </Configuration> <Configuration Name="Release|Win32" @@ -40,10 +36,6 @@ Name="VCCLCompilerTool" UsePrecompiledHeader="0" /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib " - /> </Configuration> </Configurations> <References> Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj Fri Oct 19 02:44:27 2007 @@ -33,7 +33,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib" + AdditionalDependencies="olber32.lib oldap_r.lib" LinkIncremental="2" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" /> @@ -55,7 +55,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib olber32.lib oldap_r.lib" + AdditionalDependencies="olber32.lib oldap_r.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" /> </Configuration> @@ -73,7 +73,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Wldap32.lib" + AdditionalDependencies="Wldap32.lib" LinkIncremental="1" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" /> @@ -93,7 +93,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Wldap32.lib" + AdditionalDependencies="Wldap32.lib" LinkIncremental="1" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\openldap\$(OutDir)"" /> Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj Fri Oct 19 02:44:27 2007 @@ -29,7 +29,6 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIMBCTD" - AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)";"$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)"" /> </Configuration> @@ -46,7 +45,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\libdingaling\$(OutDir)";"$(InputDir)..\..\..\..\libs\iksemel\$(OutDir)"" /> </Configuration> Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj Fri Oct 19 02:44:27 2007 @@ -31,7 +31,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" /> </Configuration> @@ -49,7 +48,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""..\..\..\..\libs\iax\$(OutDir)"" /> </Configuration> Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj Fri Oct 19 02:44:27 2007 @@ -31,7 +31,6 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIMBCTD" - AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" /> </Configuration> @@ -50,7 +49,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Iphlpapi.lib Winmm.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\portaudio\winvc\Lib"" /> </Configuration> Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj Fri Oct 19 02:44:27 2007 @@ -28,7 +28,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib iphlpapi.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)"" /> </Configuration> @@ -45,7 +44,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib iphlpapi.lib" AdditionalLibraryDirectories=""$(InputDir)..\..\..\..\libs\howl\src\lib\howl\Win32\$(OutDir)";"$(InputDir)..\..\..\..\libs\howl\src\lib\mDNSResponder\Win32\$(OutDir)"" /> </Configuration> Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -55,7 +56,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -71,6 +71,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -104,7 +105,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -55,7 +56,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -71,6 +71,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -104,7 +105,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib" OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -55,7 +56,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib odbc32.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -71,6 +71,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -104,7 +105,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib odbc32.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="1" > <Tool @@ -69,6 +70,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="1" WholeProgramOptimization="1" > Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.vcproj Fri Oct 19 02:44:27 2007 @@ -20,6 +20,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -55,7 +56,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" @@ -71,6 +71,7 @@ OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops" CharacterSet="2" > <Tool @@ -104,7 +105,6 @@ <Tool Name="VCLinkerTool" LinkLibraryDependencies="true" - AdditionalDependencies="ws2_32.lib winmm.lib " OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\..\..\libs\nspr-4.6.1.winnt5.$(OutDir)\nspr-4.6.1\lib"" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.vcproj Fri Oct 19 02:44:27 2007 @@ -29,7 +29,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Winmm.lib" /> </Configuration> <Configuration @@ -46,7 +45,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib Winmm.lib" AdditionalLibraryDirectories="" /> </Configuration> Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Fri Oct 19 02:44:27 2007 @@ -29,7 +29,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Winmm.lib Ws2_32.lib" AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" /> </Configuration> @@ -47,7 +46,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Winmm.lib Ws2_32.lib" AdditionalLibraryDirectories="..\..\..\..\libs\xmlcurl\lib;"..\..\..\..\libs\xmlcurl\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" /> </Configuration> Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Fri Oct 19 02:44:27 2007 @@ -29,7 +29,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibD"" /> </Configuration> @@ -47,7 +46,6 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" AdditionalLibraryDirectories="..\..\..\..\libs\xmlrpc\lib;"..\..\..\..\libs\xmlrpc\lib\abyss\src\$(OutDir)";"..\..\..\..\libs\apr-util\xml\expat\lib\LibR"" /> </Configuration> Modified: freeswitch/trunk/w32/modules.vsprops ============================================================================== --- freeswitch/trunk/w32/modules.vsprops (original) +++ freeswitch/trunk/w32/modules.vsprops Fri Oct 19 02:44:27 2007 @@ -5,6 +5,7 @@ Name="modules" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" + InheritedPropertySheets=".\winlibs.vsprops" > <Tool Name="VCCLCompilerTool" Modified: freeswitch/trunk/w32/winlibs.vsprops ============================================================================== --- freeswitch/trunk/w32/winlibs.vsprops (original) +++ freeswitch/trunk/w32/winlibs.vsprops Fri Oct 19 02:44:27 2007 @@ -2,10 +2,10 @@ <VisualStudioPropertySheet ProjectType="Visual C++" Version="8.00" - Name="Core Windows Libraries" + Name="Freeswitch Core Windows Libraries" > <Tool Name="VCLinkerTool" - AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" + AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Ws2_32.lib Iphlpapi.lib Winmm.lib" /> </VisualStudioPropertySheet>

1 0

[commit] r5990 - in freeswitch/trunk/src: . mod/applications/mod_conference
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: anthm Date: Fri Oct 19 01:09:18 2007 New Revision: 5990 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_core_io.c Log: you probably think i am joking but the g722 rfc ppl need to be punished Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Oct 19 01:09:18 2007 @@ -243,6 +243,7 @@ switch_mutex_t *flag_mutex; switch_mutex_t *audio_in_mutex; switch_mutex_t *audio_out_mutex; + switch_codec_t *orig_read_codec; switch_codec_t read_codec; switch_codec_t write_codec; char *rec_path; @@ -1511,7 +1512,7 @@ uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; uint32_t csamples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval); - uint32_t tsamples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval); + uint32_t tsamples;/* = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval);*/ uint32_t low_count = 0, bytes = samples * 2; call_list_t *call_list = NULL, *cp = NULL; @@ -1520,6 +1521,9 @@ assert(channel != NULL); assert(member->conference != NULL); + + tsamples = member->orig_read_codec->implementation->samples_per_frame; + if (switch_core_timer_init(&timer, member->conference->timer_name, interval, //member->conference->interval, tsamples, NULL) == SWITCH_STATUS_SUCCESS) { @@ -4198,6 +4202,7 @@ /* Save the original read codec. */ read_codec = switch_core_session_get_read_codec(session); + member.orig_read_codec = read_codec; member.native_rate = read_codec->implementation->samples_per_second; member.pool = switch_core_session_get_pool(session); @@ -4205,15 +4210,15 @@ if (switch_core_codec_init(&member.read_codec, "L16", NULL, - read_codec->implementation->samples_per_second, + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); flags = 0; goto done; } @@ -4250,10 +4255,10 @@ 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + conference->rate, read_codec->implementation->microseconds_per_frame / 1000); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - read_codec->implementation->samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); + conference->rate, read_codec->implementation->microseconds_per_frame / 1000); flags = 0; goto codec_done2; } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Oct 19 01:09:18 2007 @@ -149,7 +149,7 @@ goto done; } - if ((*frame)->codec->implementation->samples_per_second != session->write_codec->implementation->samples_per_second) { + if ((*frame)->codec->implementation->actual_samples_per_second != session->write_codec->implementation->actual_samples_per_second) { do_resample = 1; } @@ -431,7 +431,7 @@ need_codec = 1; } - if (frame->codec->implementation->samples_per_second != session->read_codec->implementation->samples_per_second) { + if (frame->codec->implementation->actual_samples_per_second != session->read_codec->implementation->actual_samples_per_second) { need_codec = 1; do_resample = 1; }

1 0

[commit] r5989 - in freeswitch/trunk/src: . mod/applications/mod_rss mod/languages/mod_spidermonkey
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: anthm Date: Thu Oct 18 23:42:02 2007 New Revision: 5989 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr_play_say.c Log: more of the same Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Oct 18 23:42:02 2007 @@ -236,7 +236,7 @@ } if (codec) { - rate = codec->implementation->samples_per_second; + rate = codec->implementation->actual_samples_per_second; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec Error!\n"); return; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Thu Oct 18 23:42:02 2007 @@ -1663,7 +1663,7 @@ int interval = 0; read_codec = switch_core_session_get_read_codec(jss->session); - rate = read_codec->implementation->samples_per_second; + rate = read_codec->implementation->actual_samples_per_second; interval = read_codec->implementation->microseconds_per_frame / 1000; if (switch_core_codec_init(&jss->speech->codec, Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu Oct 18 23:42:02 2007 @@ -1533,7 +1533,7 @@ switch_core_session_reset(session); read_codec = switch_core_session_get_read_codec(session); - rate = read_codec->implementation->samples_per_second; + rate = read_codec->implementation->actual_samples_per_second; interval = read_codec->implementation->microseconds_per_frame / 1000; if (need_create) {

1 0

[commit] r5988 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: anthm Date: Thu Oct 18 23:27:03 2007 New Revision: 5988 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix sql Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 18 23:27:03 2007 @@ -979,8 +979,8 @@ switch_time_exp_t tm; - if (argv[5]) { - switch_time_t etime = atoi(argv[5]); + if (argv[6]) { + switch_time_t etime = atoi(argv[6]); switch_size_t retsize; switch_time_exp_lt(&tm, switch_time_from_sec(etime)); @@ -989,11 +989,12 @@ cb->stream->write_function(cb->stream, + "Call-ID \t%s\n" "User \t%s@%s\n" "Contact \t%s\n" "Status \t%s(%s) EXP(%s)\n\n", - switch_str_nil(argv[0]), switch_str_nil(argv[1]), switch_str_nil(argv[2]), - switch_str_nil(argv[3]), switch_str_nil(argv[4]), exp_buf); + switch_str_nil(argv[0]), switch_str_nil(argv[1]), switch_str_nil(argv[2]), switch_str_nil(argv[3]), + switch_str_nil(argv[4]), switch_str_nil(argv[5]), exp_buf); return 0; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Oct 18 23:27:03 2007 @@ -156,8 +156,8 @@ char *contact; char to[128] = ""; - snprintf(to, sizeof(to), "%s@%s", argv[0], argv[1]); - contact = sofia_glue_get_url_from_contact(argv[2], 1); + snprintf(to, sizeof(to), "%s@%s", argv[1], argv[2]); + contact = sofia_glue_get_url_from_contact(argv[3], 1); nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END()); @@ -176,10 +176,11 @@ if (argc >= 3) { if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_EXPIRE) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", argv[0]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user", "%s", argv[1]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "host", "%s", argv[2]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", argv[3]); - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%s", argv[4]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "call-id", "%s", argv[1]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user", "%s", argv[2]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "host", "%s", argv[3]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "contact", "%s", argv[4]); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "expires", "%s", argv[5]); switch_event_fire(&s_event); } }

1 0

[commit] r5987 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/codecs/mod_amr mod/codecs/mod_g711 mod/codecs/mod_g722 mod/codecs/mod_g723_1 mod/codecs/mod_g726 mod/codecs/mod_g729 mod/codecs/mod_gsm mod/codecs/mod_h26x mod/codecs/mod_ilbc mod/codecs/mod_l16 mod/codecs/mod_lpc10 mod/codecs/mod_speex mod/endpoints/mod_sofia
by Freeswitch SVN 19 Oct '07

19 Oct '07

Author: anthm Date: Thu Oct 18 23:21:37 2007 New Revision: 5987 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_rtp.c Log: more g722 fun Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Oct 18 23:21:37 2007 @@ -502,6 +502,8 @@ char *fmtp; /*! samples transferred per second */ uint32_t samples_per_second; + /*! actual samples transferred per second for those who are not moron g722 RFC writers*/ + uint32_t actual_samples_per_second; /*! bits transferred per second */ int bits_per_second; /*! number of microseconds that denote one frame */ Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Oct 18 23:21:37 2007 @@ -4218,13 +4218,13 @@ goto done; } - if (read_codec->implementation->samples_per_second != conference->rate) { + if (read_codec->implementation->actual_samples_per_second != conference->rate) { switch_audio_resampler_t **resampler = read_codec->implementation->samples_per_second > conference->rate ? &member.read_resampler : &member.mux_resampler; if (switch_resample_create(resampler, - read_codec->implementation->samples_per_second, - read_codec->implementation->samples_per_second * 20, + read_codec->implementation->actual_samples_per_second, + read_codec->implementation->actual_samples_per_second * 20, conference->rate, conference->rate * 20, member.pool) != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Thu Oct 18 23:21:37 2007 @@ -296,6 +296,7 @@ /*.iananame */ "AMR", /*.fmtp */ "octet-align=0", /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 0, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Thu Oct 18 23:21:37 2007 @@ -188,6 +188,7 @@ /*.iananame */ "PCMU", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 120000, /*.samples_per_frame */ 960, @@ -208,6 +209,7 @@ /*.iananame */ "PCMU", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 19200, /*.microseconds_per_frame */ 60000, /*.samples_per_frame */ 480, @@ -229,6 +231,7 @@ /*.iananame */ "PCMU", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 96000, /*.microseconds_per_frame */ 30000, /*.samples_per_frame */ 240, @@ -250,6 +253,7 @@ /*.iananame */ "PCMU", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -271,6 +275,7 @@ /*.iananame */ "PCMU", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 10000, /*.samples_per_frame */ 80, @@ -294,6 +299,7 @@ /*.iananame */ "PCMA", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 120000, /*.samples_per_frame */ 960, @@ -314,6 +320,7 @@ /*.iananame */ "PCMA", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 19200, /*.microseconds_per_frame */ 60000, /*.samples_per_frame */ 480, @@ -335,6 +342,7 @@ /*.iananame */ "PCMA", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 96000, /*.microseconds_per_frame */ 30000, /*.samples_per_frame */ 240, @@ -356,6 +364,7 @@ /*.iananame */ "PCMA", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -377,6 +386,7 @@ /*.iananame */ "PCMA", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 10000, /*.samples_per_frame */ 80, Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Thu Oct 18 23:21:37 2007 @@ -54,14 +54,14 @@ return SWITCH_STATUS_FALSE; } else { if (encoding) { - if (codec->implementation->samples_per_second == 16000) { + if (codec->implementation->actual_samples_per_second == 16000) { g722_encode_init(&context->encoder_object, 64000, G722_PACKED); } else { g722_encode_init(&context->encoder_object, 64000, G722_SAMPLE_RATE_8000); } } if (decoding) { - if (codec->implementation->samples_per_second == 16000) { + if (codec->implementation->actual_samples_per_second == 16000) { g722_decode_init(&context->decoder_object, 64000, G722_PACKED); } else { g722_decode_init(&context->decoder_object, 64000, G722_SAMPLE_RATE_8000); @@ -124,6 +124,7 @@ /*.iananame */ "G722_8", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -143,7 +144,8 @@ /*.ianacode */ 9, /*.iananame */ "G722", /*.fmtp */ NULL, - /*.samples_per_second */ 16000, + /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 16000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -156,7 +158,7 @@ /*.encode */ switch_g722_encode, /*.decode */ switch_g722_decode, /*.destroy */ switch_g722_destroy, - /*.next */ &g722_8k_implementation + /*.next */ }; SWITCH_MODULE_LOAD_FUNCTION(mod_g722_load) @@ -164,7 +166,8 @@ switch_codec_interface_t *codec_interface; /* 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, "g722", &g722_16k_implementation); + SWITCH_ADD_CODEC(codec_interface, "G722", &g722_16k_implementation); + SWITCH_ADD_CODEC(codec_interface, "G722_8", &g722_8k_implementation); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Thu Oct 18 23:21:37 2007 @@ -175,6 +175,7 @@ /*.iananame */ "G723", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 6300, /*.microseconds_per_frame */ 30000, /*.samples_per_frame */ 240, Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Thu Oct 18 23:21:37 2007 @@ -94,7 +94,7 @@ g726_init_state(&handle->context); codec->private_info = handle; - handle->bits_per_frame = (switch_byte_t) (codec->implementation->bits_per_second / (codec->implementation->samples_per_second)); + handle->bits_per_frame = (switch_byte_t) (codec->implementation->bits_per_second / (codec->implementation->actual_samples_per_second)); handle->mode = (flags & SWITCH_CODEC_FLAG_AAL2 || strstr(codec->implementation->iananame, "AAL2")) ? SWITCH_BITPACK_MODE_AAL2 : SWITCH_BITPACK_MODE_RFC3551; return SWITCH_STATUS_SUCCESS; @@ -210,6 +210,7 @@ /*.iananame */ "G726-16", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 16000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -231,6 +232,7 @@ /*.iananame */ "G726-24", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 24000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -251,6 +253,7 @@ /*.iananame */ "G726-32", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 32000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -271,6 +274,7 @@ /*.iananame */ "G726-40", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 40000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -293,6 +297,7 @@ /*.iananame */ "AAL2-G726-16", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 16000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -314,6 +319,7 @@ /*.iananame */ "AAL2-G726-24", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 24000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -334,6 +340,7 @@ /*.iananame */ "AAL2-G726-32", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 32000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -354,6 +361,7 @@ /*.iananame */ "AAL2-G726-40", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 40000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Thu Oct 18 23:21:37 2007 @@ -218,6 +218,7 @@ /*.iananame */ "G729", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 128000, /*.microseconds_per_frame */ 40000, /*.samples_per_frame */ 320, @@ -238,6 +239,7 @@ /*.iananame */ "G729", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 96000, /*.microseconds_per_frame */ 30000, /*.samples_per_frame */ 240, @@ -259,6 +261,7 @@ /*.iananame */ "G729", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 32000, /*.microseconds_per_frame */ 10000, /*.samples_per_frame */ 80, @@ -280,6 +283,7 @@ /*.iananame */ "G729", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c Thu Oct 18 23:21:37 2007 @@ -140,6 +140,7 @@ /*.iananame */ "GSM", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 13200, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.c Thu Oct 18 23:21:37 2007 @@ -81,6 +81,7 @@ /*.iananame */ "H264", /*.fmtp */ NULL, /*.samples_per_second = */ 90000, + /*.actual_samples_per_second = */ 90000, /*.bits_per_second = */ 0, /*.microseconds_per_frame = */ 0, /*.samples_per_frame = */ 0, @@ -102,6 +103,7 @@ /*.iananame */ "H263", /*.fmtp */ NULL, /*.samples_per_second = */ 90000, + /*.actual_samples_per_second = */ 90000, /*.bits_per_second = */ 0, /*.microseconds_per_frame = */ 0, /*.samples_per_frame = */ 0, @@ -123,6 +125,7 @@ /*.iananame */ "H261", /*.fmtp */ NULL, /*.samples_per_second = */ 90000, + /*.actual_samples_per_second = */ 90000, /*.bits_per_second = */ 0, /*.microseconds_per_frame = */ 0, /*.samples_per_frame = */ 0, Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Thu Oct 18 23:21:37 2007 @@ -188,6 +188,7 @@ /*.iananame */ "iLBC", /*.fmtp */ "mode=30", /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_30MS * 8 * 8000 / BLOCKL_30MS, /*.microseconds_per_frame */ 30000, /*.samples_per_frame */ 240, @@ -208,6 +209,7 @@ /*.iananame */ "iLBC", /*.fmtp */ "mode=20", /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_20MS * 8 * 8000 / BLOCKL_20MS, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -231,6 +233,7 @@ /*.iananame */ "iLBC", /*.fmtp */ "mode=30", /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_30MS * 8 * 8000 / BLOCKL_30MS, /*.microseconds_per_frame */ 30000, /*.samples_per_frame */ 240, @@ -251,6 +254,7 @@ /*.iananame */ "iLBC102", /*.fmtp */ "mode=20", /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_20MS * 8 * 8000 / BLOCKL_20MS, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, @@ -273,6 +277,7 @@ /*.iananame */ "iLBC20ms", /*.fmtp */ "mode=20", /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_20MS * 8 * 8000 / BLOCKL_20MS, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Thu Oct 18 23:21:37 2007 @@ -57,7 +57,7 @@ { /* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary. */ - if (codec && other_codec && codec->implementation && other_codec->implementation && codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) { + if (codec && other_codec && codec->implementation && other_codec->implementation && codec->implementation->actual_samples_per_second != other_codec->implementation->actual_samples_per_second) { memcpy(encoded_data, decoded_data, decoded_data_len); *encoded_data_len = decoded_data_len; return SWITCH_STATUS_RESAMPLE; @@ -72,7 +72,7 @@ uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, unsigned int *flag) { - if (codec && other_codec && codec->implementation && other_codec->implementation && codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) { + if (codec && other_codec && codec->implementation && other_codec->implementation && codec->implementation->actual_samples_per_second != other_codec->implementation->actual_samples_per_second) { memcpy(decoded_data, encoded_data, encoded_data_len); *decoded_data_len = encoded_data_len; return SWITCH_STATUS_RESAMPLE; @@ -93,6 +93,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 32000, + /*.actual_samples_per_second = */ 32000, /*.bits_per_second = */ 512000, /*.microseconds_per_frame = */ 60000, /*.samples_per_frame = */ 1920, @@ -114,6 +115,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 32000, + /*.actual_samples_per_second = */ 32000, /*.bits_per_second = */ 512000, /*.microseconds_per_frame = */ 30000, /*.samples_per_frame = */ 960, @@ -135,6 +137,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 32000, + /*.actual_samples_per_second = */ 32000, /*.bits_per_second = */ 512000, /*.microseconds_per_frame = */ 20000, /*.samples_per_frame = */ 640, @@ -156,6 +159,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 32000, + /*.actual_samples_per_second = */ 32000, /*.bits_per_second = */ 512000, /*.microseconds_per_frame = */ 10000, /*.samples_per_frame = */ 320, @@ -177,6 +181,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 22050, + /*.actual_samples_per_second = */ 22050, /*.bits_per_second = */ 352800, /*.microseconds_per_frame = */ 20000, /*.samples_per_frame = */ 441, @@ -198,6 +203,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 16000, + /*.actual_samples_per_second */ 16000, /*.bits_per_second */ 256000, /*.microseconds_per_frame */ 120000, /*.samples_per_frame */ 1920, @@ -219,6 +225,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 16000, + /*.actual_samples_per_second */ 16000, /*.bits_per_second */ 256000, /*.microseconds_per_frame */ 60000, /*.samples_per_frame */ 960, @@ -240,6 +247,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 16000, + /*.actual_samples_per_second */ 16000, /*.bits_per_second */ 256000, /*.microseconds_per_frame */ 30000, /*.samples_per_frame */ 480, @@ -261,6 +269,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 16000, + /*.actual_samples_per_second = */ 16000, /*.bits_per_second = */ 256000, /*.microseconds_per_frame = */ 20000, /*.samples_per_frame = */ 320, @@ -282,6 +291,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 16000, + /*.actual_samples_per_second = */ 16000, /*.bits_per_second = */ 256000, /*.microseconds_per_frame = */ 10000, /*.samples_per_frame = */ 160, @@ -306,6 +316,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 512000, /*.microseconds_per_frame */ 120000, /*.samples_per_frame */ 960, @@ -328,6 +339,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 256000, /*.microseconds_per_frame */ 60000, /*.samples_per_frame */ 480, @@ -349,6 +361,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 128000, /*.microseconds_per_frame */ 30000, /*.samples_per_frame */ 240, @@ -369,6 +382,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 8000, + /*.actual_samples_per_second = */ 8000, /*.bits_per_second = */ 128000, /*.microseconds_per_frame = */ 20000, /*.samples_per_frame = */ 160, @@ -392,6 +406,7 @@ /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second = */ 8000, + /*.actual_samples_per_second = */ 8000, /*.bits_per_second = */ 128000, /*.microseconds_per_frame = */ 10000, /*.samples_per_frame = */ 80, Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Thu Oct 18 23:21:37 2007 @@ -162,6 +162,7 @@ /*.iananame */ "LPC", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 240, /*.microseconds_per_frame */ 22500, /*.samples_per_frame */ 180, Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Thu Oct 18 23:21:37 2007 @@ -268,6 +268,7 @@ /*.iananame */ "speex", /*.fmtp */ NULL, /*.samples_per_second */ 32000, + /*.actual_samples_per_second */ 32000, /*.bits_per_second */ 256000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 640, @@ -288,6 +289,7 @@ /*.iananame */ "speex", /*.fmtp */ NULL, /*.samples_per_second */ 16000, + /*.actual_samples_per_second */ 16000, /*.bits_per_second */ 22000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 320, @@ -310,6 +312,7 @@ /*.iananame */ "speex", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 3300, /*.nanoseconds_per_frame */ 60000, /*.samples_per_frame */ 480, @@ -331,6 +334,7 @@ /*.iananame */ "speex", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 22000, /*.nanoseconds_per_frame */ 40000, /*.samples_per_frame */ 240, @@ -354,6 +358,7 @@ /*.iananame */ "speex", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 1650, /*.nanoseconds_per_frame */ 30000, /*.samples_per_frame */ 240, @@ -375,6 +380,7 @@ /*.iananame */ "speex", /*.fmtp */ NULL, /*.samples_per_second */ 8000, + /*.actual_samples_per_second */ 8000, /*.bits_per_second */ 11000, /*.nanoseconds_per_frame */ 20000, /*.samples_per_frame */ 160, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Oct 18 23:21:37 2007 @@ -122,9 +122,6 @@ if (tech_pvt->rm_encoding) { rate = tech_pvt->rm_rate; - if (tech_pvt->pt == 9) { - rate = 8000; - } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->pt, tech_pvt->rm_encoding, rate); if (tech_pvt->fmtp_out) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); @@ -156,9 +153,6 @@ if (ptime && ptime != imp->microseconds_per_frame / 1000) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime); } - if (imp->ianacode == 9) { - rate = 8000; - } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, rate); if (imp->fmtp) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); @@ -1251,10 +1245,6 @@ continue; } - if (imp->ianacode == 9) { - codec_rate = 8000; - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u]/[%s:%d:%u]\n", rm_encoding, map->rm_pt, (int)map->rm_rate, imp->iananame, imp->ianacode, codec_rate); if (map->rm_pt < 96) { @@ -1307,11 +1297,7 @@ if ((tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *) rm_encoding))) { char tmp[50]; tech_pvt->pt = (switch_payload_t) map->rm_pt; - if (map->rm_pt == 9) { - tech_pvt->rm_rate = 16000; /* *stab* *stab* *stab* */ - } else { - tech_pvt->rm_rate = map->rm_rate; - } + tech_pvt->rm_rate = map->rm_rate; tech_pvt->codec_ms = mimp->microseconds_per_frame / 1000; tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *) connection->c_address); tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *) map->rm_fmtp); Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Oct 18 23:21:37 2007 @@ -178,9 +178,9 @@ case SWITCH_STATUS_RESAMPLE: if (!session->read_resampler) { if (switch_resample_create(&session->read_resampler, - read_frame->codec->implementation->samples_per_second, + read_frame->codec->implementation->actual_samples_per_second, read_frame->codec->implementation->bytes_per_frame * 20, - session->read_codec->implementation->samples_per_second, + session->read_codec->implementation->actual_samples_per_second, session->read_codec->implementation->bytes_per_frame * 20, session->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate resampler\n"); status = SWITCH_STATUS_FALSE; @@ -458,9 +458,9 @@ write_frame = &session->raw_write_frame; if (!session->write_resampler) { status = switch_resample_create(&session->write_resampler, - frame->codec->implementation->samples_per_second, + frame->codec->implementation->actual_samples_per_second, frame->codec->implementation->bytes_per_frame * 20, - session->write_codec->implementation->samples_per_second, + session->write_codec->implementation->actual_samples_per_second, session->write_codec->implementation->bytes_per_frame * 20, session->pool); if (status != SWITCH_STATUS_SUCCESS) { goto done; @@ -680,10 +680,9 @@ write_frame = &session->enc_write_frame; if (!session->read_resampler) { status = switch_resample_create(&session->read_resampler, - frame->codec->implementation->samples_per_second, + frame->codec->implementation->actual_samples_per_second, frame->codec->implementation->bytes_per_frame * 20, - session->write_codec->implementation-> - samples_per_second, + session->write_codec->implementation->actual_samples_per_second, session->write_codec->implementation->bytes_per_frame * 20, session->pool); if (status != SWITCH_STATUS_SUCCESS) { goto done; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Oct 18 23:21:37 2007 @@ -846,13 +846,7 @@ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { return -1; } -#if 1 - if (rtp_session->recv_msg.header.pt == 9 /* && G722 RFC != LAME */) { - uint32_t rfc_sucks = ntohl(rtp_session->recv_msg.header.ts); - rfc_sucks *= 2; - rtp_session->recv_msg.header.ts = htonl(rfc_sucks); - } -#endif + if (rtp_session->jb && bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) { if (rtp_session->recv_msg.header.m) { stfu_n_reset(rtp_session->jb); @@ -1623,11 +1617,6 @@ } send_msg = rtp_session->send_msg; -#if 1 - if (payload == 9 /* && G722 RFC != LAME */) { - ts /= 2; - } -#endif send_msg.header.seq = htons(mseq); send_msg.header.ts = htonl(ts); send_msg.header.ssrc = htonl(ssrc);

1 0