diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index 0326ffac12..9b8b94cd78 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -556,6 +556,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_switch_ivr_originate", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_switch_core_codec", "tests\unit\test_switch_core_codec.2017.vcxproj", "{589A07E7-5DE5-49FD-A62C-27795B806AFB}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_v34_tx_pre_emphasis_filters", "libs\win32\spandsp\make_v34_tx_pre_emphasis_filters.2017.vcxproj", "{97035E2A-392E-40D1-B27D-DA700A1FDB49}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_v34_shell_map", "libs\win32\spandsp\make_v34_shell_map.2017.vcxproj", "{4A1CA87F-32EF-428E-8D55-7F0D6D91516B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_v34_probe_signals", "libs\win32\spandsp\make_v34_probe_signals.2017.vcxproj", "{D33E088B-0A1A-498E-B825-9E49040E28DF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_v34_convolutional_coders", "libs\win32\spandsp\make_v34_convolutional_coders.2017.vcxproj", "{368924D6-AC75-42AE-9D64-7E3EB3FD109C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_godard_descriptor", "libs\win32\spandsp\make_modem_godard_descriptor.2017.vcxproj", "{C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -2530,6 +2540,66 @@ Global {589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|Win32.Build.0 = Release|Win32 {589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|x64.ActiveCfg = Release|x64 {589A07E7-5DE5-49FD-A62C-27795B806AFB}.Release|x64.Build.0 = Release|x64 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.All|Win32.ActiveCfg = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.All|Win32.Build.0 = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.All|x64.ActiveCfg = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.All|x64.Build.0 = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Debug|Win32.ActiveCfg = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Debug|Win32.Build.0 = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Debug|x64.ActiveCfg = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Debug|x64.Build.0 = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Release|Win32.ActiveCfg = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Release|Win32.Build.0 = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Release|x64.ActiveCfg = All|Win32 + {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Release|x64.Build.0 = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.All|Win32.ActiveCfg = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.All|Win32.Build.0 = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.All|x64.ActiveCfg = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.All|x64.Build.0 = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Debug|Win32.ActiveCfg = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Debug|Win32.Build.0 = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Debug|x64.ActiveCfg = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Debug|x64.Build.0 = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Release|Win32.ActiveCfg = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Release|Win32.Build.0 = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Release|x64.ActiveCfg = All|Win32 + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Release|x64.Build.0 = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.All|Win32.ActiveCfg = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.All|Win32.Build.0 = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.All|x64.ActiveCfg = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.All|x64.Build.0 = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.Debug|Win32.ActiveCfg = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.Debug|Win32.Build.0 = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.Debug|x64.ActiveCfg = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.Debug|x64.Build.0 = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.Release|Win32.ActiveCfg = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.Release|Win32.Build.0 = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.Release|x64.ActiveCfg = All|Win32 + {D33E088B-0A1A-498E-B825-9E49040E28DF}.Release|x64.Build.0 = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.All|Win32.ActiveCfg = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.All|Win32.Build.0 = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.All|x64.ActiveCfg = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.All|x64.Build.0 = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Debug|Win32.ActiveCfg = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Debug|Win32.Build.0 = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Debug|x64.ActiveCfg = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Debug|x64.Build.0 = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Release|Win32.ActiveCfg = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Release|Win32.Build.0 = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Release|x64.ActiveCfg = All|Win32 + {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Release|x64.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|Win32.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|Win32.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|x64.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|x64.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|Win32.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|Win32.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|x64.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|x64.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|Win32.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|Win32.Build.0 = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|x64.ActiveCfg = All|Win32 + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|x64.Build.0 = All|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2729,6 +2799,11 @@ Global {580675D7-C1C9-4197-AAC5-00F64FAFDE78} = {9388C266-C3FC-468A-92EF-0CBC35941412} {69A7464A-9B0D-4804-A108-835229DACF58} = {9388C266-C3FC-468A-92EF-0CBC35941412} {589A07E7-5DE5-49FD-A62C-27795B806AFB} = {9388C266-C3FC-468A-92EF-0CBC35941412} + {97035E2A-392E-40D1-B27D-DA700A1FDB49} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {D33E088B-0A1A-498E-B825-9E49040E28DF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {368924D6-AC75-42AE-9D64-7E3EB3FD109C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {09840DE7-9208-45AA-9667-1A71EE93BD1E} diff --git a/libs/.gitignore b/libs/.gitignore index 87da2671c6..0073e66e7b 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -651,5 +651,7 @@ mariadb-connector-c-*/ mariadb-connector-c-* /spandsp*/ /spandsp* +win32/spandsp/filters.csv win32/spandsp/spandsp.h +win32/spandsp/v34_tx_pre_emphasis_filters.h win32/spandsp/win32 diff --git a/libs/win32/spandsp/libspandsp.2017.vcxproj b/libs/win32/spandsp/libspandsp.2017.vcxproj index 6a3d8012d0..ad6965a005 100644 --- a/libs/win32/spandsp/libspandsp.2017.vcxproj +++ b/libs/win32/spandsp/libspandsp.2017.vcxproj @@ -1,4 +1,4 @@ - + @@ -188,6 +188,7 @@ + @@ -254,11 +255,19 @@ + + + + + + + + @@ -290,6 +299,7 @@ + @@ -309,6 +319,8 @@ + + @@ -335,6 +347,9 @@ + + + @@ -346,6 +361,7 @@ + @@ -383,6 +399,7 @@ + @@ -405,6 +422,8 @@ + + @@ -416,6 +435,7 @@ + @@ -464,6 +484,18 @@ {eddb8ab9-c53e-44c0-a620-0e86c2cbd5d5} false + + {368924d6-ac75-42ae-9d64-7e3eb3fd109c} + + + {d33e088b-0a1a-498e-b825-9e49040e28df} + + + {4a1ca87f-32ef-428e-8d55-7f0d6d91516b} + + + {97035e2a-392e-40d1-b27d-da700a1fdb49} + diff --git a/libs/win32/spandsp/make_modem_filter.2017.vcxproj b/libs/win32/spandsp/make_modem_filter.2017.vcxproj index eae331a73a..fcdee8a4b9 100644 --- a/libs/win32/spandsp/make_modem_filter.2017.vcxproj +++ b/libs/win32/spandsp/make_modem_filter.2017.vcxproj @@ -79,6 +79,26 @@ "$(TargetPath)" -m V.27ter2400 -t >"..\..\spandsp\src\v27ter_tx_2400_floating_rrc.h" "$(TargetPath)" -m V.27ter4800 -t >"..\..\spandsp\src\v27ter_tx_4800_floating_rrc.h" +"$(TargetPath)" -m V.34_2400 -r >"..\..\spandsp\src\v34_rx_2400_low_carrier_rrc.h" +"$(TargetPath)" -m V.34_2400_high -r >"..\..\spandsp\src\v34_rx_2400_high_carrier_rrc.h" +"$(TargetPath)" -m V.34_2743 -r >"..\..\spandsp\src\v34_rx_2743_low_carrier_rrc.h" +"$(TargetPath)" -m V.34_2743_high -r >"..\..\spandsp\src\v34_rx_2743_high_carrier_rrc.h" +"$(TargetPath)" -m V.34_2800 -r >"..\..\spandsp\src\v34_rx_2800_low_carrier_rrc.h" +"$(TargetPath)" -m V.34_2800_high -r >"..\..\spandsp\src\v34_rx_2800_high_carrier_rrc.h" +"$(TargetPath)" -m V.34_3000 -r >"..\..\spandsp\src\v34_rx_3000_low_carrier_rrc.h" +"$(TargetPath)" -m V.34_3000_high -r >"..\..\spandsp\src\v34_rx_3000_high_carrier_rrc.h" +"$(TargetPath)" -m V.34_3200 -r >"..\..\spandsp\src\v34_rx_3200_low_carrier_rrc.h" +"$(TargetPath)" -m V.34_3200_high -r >"..\..\spandsp\src\v34_rx_3200_high_carrier_rrc.h" + + +"$(TargetPath)" -m V.34_2400 -t >"..\..\spandsp\src\v34_tx_2400_rrc.h" +"$(TargetPath)" -m V.34_2743 -t >"..\..\spandsp\src\v34_tx_2743_rrc.h" +"$(TargetPath)" -m V.34_2800 -t >"..\..\spandsp\src\v34_tx_2800_rrc.h" +"$(TargetPath)" -m V.34_3000 -t >"..\..\spandsp\src\v34_tx_3000_rrc.h" +"$(TargetPath)" -m V.34_3200 -t >"..\..\spandsp\src\v34_tx_3200_rrc.h" +"$(TargetPath)" -m V.34_3429 -t >"..\..\spandsp\src\v34_tx_3429_rrc.h" + + "$(TargetPath)" -m V.29 -r >"..\..\spandsp\src\v29rx_rrc.h" "$(TargetPath)" -m V.29 -r >"..\..\spandsp\src\v29rx_floating_rrc.h" "$(TargetPath)" -m V.29 -t >"..\..\spandsp\src\v29tx_rrc.h" diff --git a/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj b/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj new file mode 100644 index 0000000000..738362297e --- /dev/null +++ b/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj @@ -0,0 +1,75 @@ + + + + + All + Win32 + + + + make_modem_godard_descriptor + make_modem_godard_descriptor + Win32Proj + {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14} + + + + Application + Unicode + $(DefaultPlatformToolset) + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\$(Configuration)\ + $(PlatformName)\make_modem_godard_descriptor\$(Configuration)\ + false + + + + $(IntDir)BuildLog $(ProjectName).htm + + + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + $(IntDir)$(TargetName).pdb + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + "$(TargetPath)" 1800.0 2400.0 0.99 1000.0 100.0 15 1 >"..\..\spandsp\src\v17_v32bis_rx_godard.h" +"$(TargetPath)" 1700.0 2400.0 0.99 1000.0 30.0 5 1 >"..\..\spandsp\src\v29rx_godard.h" + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libs/win32/spandsp/make_v34_convolutional_coders.2017.vcxproj b/libs/win32/spandsp/make_v34_convolutional_coders.2017.vcxproj new file mode 100644 index 0000000000..eb07ff39bd --- /dev/null +++ b/libs/win32/spandsp/make_v34_convolutional_coders.2017.vcxproj @@ -0,0 +1,69 @@ + + + + + All + Win32 + + + + make_v34_convolutional_coders + make_v34_convolutional_coders + Win32Proj + {368924D6-AC75-42AE-9D64-7E3EB3FD109C} + + + + Application + Unicode + $(DefaultPlatformToolset) + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\$(Configuration)\ + $(PlatformName)\make_v34_convolutional_coders\$(Configuration)\ + false + + + + $(IntDir)BuildLog $(ProjectName).htm + + + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + $(IntDir)$(TargetName).pdb + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + "$(TargetPath)" >"..\..\spandsp\src\v34_convolutional_coders.h" + + + + + + + + + \ No newline at end of file diff --git a/libs/win32/spandsp/make_v34_probe_signals.2017.vcxproj b/libs/win32/spandsp/make_v34_probe_signals.2017.vcxproj new file mode 100644 index 0000000000..258ec794cc --- /dev/null +++ b/libs/win32/spandsp/make_v34_probe_signals.2017.vcxproj @@ -0,0 +1,71 @@ + + + + + All + Win32 + + + + make_v34_probe_signals + make_v34_probe_signals + Win32Proj + {D33E088B-0A1A-498E-B825-9E49040E28DF} + + + + Application + Unicode + $(DefaultPlatformToolset) + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\$(Configuration)\ + $(PlatformName)\make_v34_probe_signals\$(Configuration)\ + false + + + + $(IntDir)BuildLog $(ProjectName).htm + + + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;LIBSPANDSP_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + $(IntDir)$(TargetName).pdb + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + "$(TargetPath)" >"..\..\spandsp\src\v34_probe_signals.h" + + + + + + + + + + + \ No newline at end of file diff --git a/libs/win32/spandsp/make_v34_shell_map.2017.vcxproj b/libs/win32/spandsp/make_v34_shell_map.2017.vcxproj new file mode 100644 index 0000000000..a9d741da1c --- /dev/null +++ b/libs/win32/spandsp/make_v34_shell_map.2017.vcxproj @@ -0,0 +1,69 @@ + + + + + All + Win32 + + + + make_v34_shell_map + make_v34_shell_map + Win32Proj + {4A1CA87F-32EF-428E-8D55-7F0D6D91516B} + + + + Application + Unicode + $(DefaultPlatformToolset) + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\$(Configuration)\ + $(PlatformName)\make_v34_shell_map\$(Configuration)\ + false + + + + $(IntDir)BuildLog $(ProjectName).htm + + + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + $(IntDir)$(TargetName).pdb + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + "$(TargetPath)" >"..\..\spandsp\src\v34_shell_map.h" + + + + + + + + + \ No newline at end of file diff --git a/libs/win32/spandsp/make_v34_tx_pre_emphasis_filters.2017.vcxproj b/libs/win32/spandsp/make_v34_tx_pre_emphasis_filters.2017.vcxproj new file mode 100644 index 0000000000..b1826e57ba --- /dev/null +++ b/libs/win32/spandsp/make_v34_tx_pre_emphasis_filters.2017.vcxproj @@ -0,0 +1,71 @@ + + + + + All + Win32 + + + + make_v34_tx_pre_emphasis_filters + make_v34_tx_pre_emphasis_filters + Win32Proj + {97035E2A-392E-40D1-B27D-DA700A1FDB49} + + + + Application + Unicode + $(DefaultPlatformToolset) + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(PlatformName)\$(Configuration)\ + $(PlatformName)\make_v34_tx_pre_emphasis_filters\$(Configuration)\ + false + + + + $(IntDir)BuildLog $(ProjectName).htm + + + .;..\..\spandsp\tools;%(AdditionalIncludeDirectories) + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + $(IntDir)$(TargetName).pdb + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + "$(TargetPath)" + + + + + + + + + + \ No newline at end of file diff --git a/w32/download_spandsp.props b/w32/download_spandsp.props index f02c66a9bd..e176e6bfdc 100644 --- a/w32/download_spandsp.props +++ b/w32/download_spandsp.props @@ -1,6 +1,7 @@ + @@ -29,7 +30,7 @@ - 0d2e6ac65e0e8f53d652665a743015a88bf048d4 + master true