Author: mrene Date: Wed Oct 15 16:37:18 2008 New Revision: 10034 Added: freeswitch/branches/mrene/libs/win32/mpg123/ (props changed) - copied from r10033, /freeswitch/trunk/libs/win32/mpg123/ freeswitch/branches/mrene/libs/win32/mpg123/libmpg123/ - copied from r10033, /freeswitch/trunk/libs/win32/mpg123/libmpg123/ freeswitch/branches/mrene/libs/win32/mpg123/libmpg123.2008.vcproj - copied unchanged from r10033, /freeswitch/trunk/libs/win32/mpg123/libmpg123.2008.vcproj freeswitch/branches/mrene/libs/win32/mpg123/libmpg123/config.h - copied unchanged from r10033, /freeswitch/trunk/libs/win32/mpg123/libmpg123/config.h freeswitch/branches/mrene/libs/win32/mpg123/libmpg123/mpg123.h - copied unchanged from r10033, /freeswitch/trunk/libs/win32/mpg123/libmpg123/mpg123.h Removed: freeswitch/branches/mrene/src/mod/formats/mod_shout/windows/ Modified: freeswitch/branches/mrene/Freeswitch.2008.sln freeswitch/branches/mrene/src/mod/formats/mod_shout/mod_shout.vcproj freeswitch/branches/mrene/src/switch_pcm.c Log: Merge with r10033 Modified: freeswitch/branches/mrene/Freeswitch.2008.sln ============================================================================== --- freeswitch/branches/mrene/Freeswitch.2008.sln (original) +++ freeswitch/branches/mrene/Freeswitch.2008.sln Wed Oct 15 16:37:18 2008 @@ -26,6 +26,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XML Interfaces", "XML Interfaces", "{F69A4A6B-9360-4EBB-A280-22AA3C455AC5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" + ProjectSection(SolutionItems) = preProject + libs\win32\mpg123\libmpg123.2008.vcproj = libs\win32\mpg123\libmpg123.2008.vcproj + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" EndProject @@ -949,6 +952,7 @@ {E316772F-5D8F-4F2A-8F71-094C3E859D34} = {E316772F-5D8F-4F2A-8F71-094C3E859D34} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {419C8F80-D858-4B48-A25C-AF4007608137} = {419C8F80-D858-4B48-A25C-AF4007608137} {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} EndProjectSection EndProject @@ -974,6 +978,11 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download mpg123", "libs\win32\Download mpg123.2008.vcproj", "{E796E337-DE78-4303-8614-9A590862EE95}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpg123", "libs\win32\mpg123\libmpg123.2008.vcproj", "{419C8F80-D858-4B48-A25C-AF4007608137}" + ProjectSection(ProjectDependencies) = postProject + {E796E337-DE78-4303-8614-9A590862EE95} = {E796E337-DE78-4303-8614-9A590862EE95} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1706,6 +1715,12 @@ {E796E337-DE78-4303-8614-9A590862EE95}.Release|Win32.ActiveCfg = Release|Win32 {E796E337-DE78-4303-8614-9A590862EE95}.Release|Win32.Build.0 = Release|Win32 {E796E337-DE78-4303-8614-9A590862EE95}.Release|x64.ActiveCfg = Release|Win32 + {419C8F80-D858-4B48-A25C-AF4007608137}.Debug|Win32.ActiveCfg = Debug|Win32 + {419C8F80-D858-4B48-A25C-AF4007608137}.Debug|Win32.Build.0 = Debug|Win32 + {419C8F80-D858-4B48-A25C-AF4007608137}.Debug|x64.ActiveCfg = Debug|Win32 + {419C8F80-D858-4B48-A25C-AF4007608137}.Release|Win32.ActiveCfg = Release|Win32 + {419C8F80-D858-4B48-A25C-AF4007608137}.Release|Win32.Build.0 = Release|Win32 + {419C8F80-D858-4B48-A25C-AF4007608137}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1801,6 +1816,7 @@ {E316772F-5D8F-4F2A-8F71-094C3E859D34} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D3D8B329-20BE-475E-9E83-653CEA0E0EF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} + {419C8F80-D858-4B48-A25C-AF4007608137} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D} {4F92B672-DADB-4047-8D6A-4BB3796733FD} = {C120A020-773F-4EA3-923F-B67AF28B750D} Modified: freeswitch/branches/mrene/src/mod/formats/mod_shout/mod_shout.vcproj ============================================================================== --- freeswitch/branches/mrene/src/mod/formats/mod_shout/mod_shout.vcproj (original) +++ freeswitch/branches/mrene/src/mod/formats/mod_shout/mod_shout.vcproj Wed Oct 15 16:37:18 2008 @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../../libs/curl/include;"../../../../libs/lame-3.97/include";..\..\..\..\libs\win32\libshout;"..\..\..\..\libs\libshout-2.2.2\include";..\..\..\..\libs\mpg123\src;"$(ProjectDir)windows"" + AdditionalIncludeDirectories="../../../../libs/curl/include;"../../../../libs/lame-3.97/include";..\..\..\..\libs\win32\libshout;"..\..\..\..\libs\libshout-2.2.2\include";..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123" PreprocessorDefinitions="CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../../../../libs/curl/include;"../../../../libs/lame-3.97/include";..\..\..\..\libs\win32\libshout;"..\..\..\..\libs\libshout-2.2.2\include";..\..\..\..\libs\mpg123\src;"$(ProjectDir)windows"" + AdditionalIncludeDirectories="../../../../libs/curl/include;"../../../../libs/lame-3.97/include";..\..\..\..\libs\win32\libshout;"..\..\..\..\libs\libshout-2.2.2\include";..\..\..\..\libs\mpg123\src;..\..\..\..\libs\win32\mpg123" PreprocessorDefinitions="CURL_STATICLIB" RuntimeLibrary="2" EnableFunctionLevelLinking="true" Modified: freeswitch/branches/mrene/src/switch_pcm.c ============================================================================== --- freeswitch/branches/mrene/src/switch_pcm.c (original) +++ freeswitch/branches/mrene/src/switch_pcm.c Wed Oct 15 16:37:18 2008 @@ -275,7 +275,7 @@ for (count = 12; count > 0; count--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, 0, "PCMU", NULL, 8000, 8000, 64000, - mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 1, switch_g711u_init, switch_g711u_encode, switch_g711u_decode, switch_g711u_destroy); } @@ -283,7 +283,7 @@ for (count = 12; count > 0; count--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, 8, "PCMA", NULL, 8000, 8000, 64000, - mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 12, + mpf * count, spf * count, bpf * count, ebpf * count, 1, 1, 1, switch_g711a_init, switch_g711a_encode, switch_g711a_decode, switch_g711a_destroy); } @@ -316,7 +316,7 @@ for (countb = 12; countb > 0; countb--) { switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, ianacode[counta], "L16", NULL, rate, rate, bps, - mpf * countb, spf * countb, bpf * countb, ebpf * countb, 1, 1, 12, + mpf * countb, spf * countb, bpf * countb, ebpf * countb, 1, 1, 1, switch_raw_init, switch_raw_encode, switch_raw_decode, switch_raw_destroy); } rate = rate * 2;