msvc ports for ilbc and lpc10 codec libs.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@169 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/codec/ilbc/libilbc.vcproj b/libs/codec/ilbc/libilbc.vcproj
new file mode 100644 (file)
index 0000000..b6cfff0
--- /dev/null
+++ b/libs/codec/ilbc/libilbc.vcproj
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="libilbc"\r
+       ProjectGUID="{989BB874-7AF1-44CB-8E5C-CC8113D267E8}"\r
+       RootNamespace="libilbc"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\anaFilter.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\constants.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\createCB.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\doCPLC.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\enhancer.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\filter.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\FrameClassify.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gainquant.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\getCBvec.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\helpfun.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\hpInput.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\hpOutput.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iCBConstruct.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iCBSearch.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iLBC_decode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iLBC_encode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LPCdecode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LPCencode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lsf.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\packing.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\StateConstructW.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\StateSearchW.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\syntFilter.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\anaFilter.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\constants.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\createCB.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\doCPLC.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\enhancer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\filter.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\FrameClassify.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\gainquant.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\getCBvec.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\helpfun.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\hpInput.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\hpOutput.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iCBConstruct.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iCBSearch.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iLBC_decode.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iLBC_define.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\iLBC_encode.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LPCdecode.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LPCencode.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lsf.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\packing.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\StateConstructW.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\StateSearchW.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\syntFilter.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/libs/codec/lpc10/bsynz.c b/libs/codec/lpc10/bsynz.c
index e4810de222d77a24d0cbd8863915a33c2f280cf0..7c75abc9ca446265867e727d75efcd85b688c92e 100644 (file)
--- a/libs/codec/lpc10/bsynz.c
+++ b/libs/codec/lpc10/bsynz.c
@@ -372,7 +372,7 @@ e */
        exc[px] -= pulse;\r
 /*  Load voiced excitation */\r
     } else {\r
-       sscale = sqrt((real) (*ip)) / 6.928f;\r
+       sscale = (real)sqrt((real) (*ip)) / 6.928f;\r
        i__1 = *ip;\r
        for (i__ = 1; i__ <= i__1; ++i__) {\r
            exc[contrl_1.order + i__ - 1] = 0.f;\r
@@ -438,7 +438,7 @@ e */
 /*  Apply gain to match RMS */\r
     r__1 = *rms * *rms;\r
     ssq = r__1 * *ip;\r
-    gain = sqrt(ssq / xssq);\r
+    gain = (real)sqrt(ssq / xssq);\r
     i__1 = *ip;\r
     for (i__ = 1; i__ <= i__1; ++i__) {\r
        sout[i__] = gain * exc2[contrl_1.order + i__ - 1];\r

diff --git a/libs/codec/lpc10/decode.c b/libs/codec/lpc10/decode.c
index 3ab77e6831fe5889d0926e1176b313c0058d1be6..ee1ecb388b9dddce244df06af4ce71eb38123394 100644 (file)
--- a/libs/codec/lpc10/decode.c
+++ b/libs/codec/lpc10/decode.c
@@ -518,7 +518,7 @@ static integer c__2 = 2;
            drc[(5 - i__) * 3 - 2] = iout;\r
        }\r
 /*  Determine error rate */\r
-       *erate = *erate * .96875f + errcnt * 102;\r
+       *erate = (integer)(*erate * .96875f + errcnt * 102);\r
     }\r
 /*  Get unsmoothed RMS, RC's, and PITCH */\r
     *irms = drms[1];\r
@@ -611,7 +611,7 @@ L900:
        ishift = 15 - nbit[i__ - 1];\r
        i2 *= pow_ii(&c__2, &ishift);\r
        i2 += qb[i__ - 3];\r
-       irc[i__] = i2 * descl[i__ - 3] + deadd[i__ - 3];\r
+       irc[i__] = (integer)(i2 * descl[i__ - 3] + deadd[i__ - 3]);\r
     }\r
 /*     IF (LISTL.GE.3) WRITE(FDEBUG,811) IRMS, (IRC(I),I=1,ORDER) */\r
 /* 811 FORMAT(1X,'<<DECODE OUT>>',T45,I4,1X,10I8) */\r

diff --git a/libs/codec/lpc10/encode.c b/libs/codec/lpc10/encode.c
index cfe1ef7991d9acd785a1a68e431582d05af7a3fd..21a784647a914659a16c2e1dcf7de2f7a1dc7bbb 100644 (file)
--- a/libs/codec/lpc10/encode.c
+++ b/libs/codec/lpc10/encode.c
@@ -279,10 +279,10 @@ static integer c__2 = 2;
 \r
     /* Function Body */\r
 /*  Scale RMS and RC's to integers */\r
-    *irms = *rms;\r
+    *irms = (integer)*rms;\r
     i__1 = contrl_1.order;\r
     for (i__ = 1; i__ <= i__1; ++i__) {\r
-       irc[i__] = rc[i__] * 32768.f;\r
+       irc[i__] = (integer)(rc[i__] * 32768.f);\r
     }\r
 /*     IF(LISTL.GE.3)WRITE(FDEBUG,800)VOICE,PITCH,IRMS,(IRC(I),I=1,ORDER) */\r
 /* 800 FORMAT(1X,/,' <<ENCODE IN>>',T32,2I3,I6,I5,T50,10I8) */\r
@@ -336,8 +336,8 @@ static integer c__2 = 2;
     i__1 = contrl_1.order;\r
     for (i__ = 3; i__ <= i__1; ++i__) {\r
        i2 = irc[i__] / 2;\r
-       i2 = (i2 + enadd[contrl_1.order + 1 - i__ - 1]) * enscl[\r
-               contrl_1.order + 1 - i__ - 1];\r
+       i2 = (integer)((i2 + enadd[contrl_1.order + 1 - i__ - 1]) * enscl[\r
+               contrl_1.order + 1 - i__ - 1]);\r
 /* Computing MIN */\r
        i__2 = max(i2,-127);\r
        i2 = min(i__2,127);\r

diff --git a/libs/codec/lpc10/energy.c b/libs/codec/lpc10/energy.c
index c5594b8bbf671a8eeab44c28261c7b2318f331d4..601bc588ddf5ce054bc092adbc18a328d3759aef 100644 (file)
--- a/libs/codec/lpc10/energy.c
+++ b/libs/codec/lpc10/energy.c
@@ -97,7 +97,7 @@ extern int energy_(integer *len, real *speech, real *rms);
     for (i__ = 1; i__ <= i__1; ++i__) {\r
        *rms += speech[i__] * speech[i__];\r
     }\r
-    *rms = sqrt(*rms / *len);\r
+    *rms = (real)sqrt(*rms / *len);\r
     return 0;\r
 } /* energy_ */\r
 \r

diff --git a/libs/codec/lpc10/f2clib.c b/libs/codec/lpc10/f2clib.c
index aaee644101c6a8660a9b074c2ccf7e91259887b9..a340a96b27896501343687f7336f4988059576a2 100644 (file)
--- a/libs/codec/lpc10/f2clib.c
+++ b/libs/codec/lpc10/f2clib.c
@@ -40,7 +40,7 @@ integer pow_ii(integer *ap, integer *bp)
                if (n == 0 || x == 1)\r
                        return 1;\r
                if (x != -1)\r
-                       return x == 0 ? 1/x : 0;\r
+                       return x == 0 ? 0 : 1/x;\r
                n = -n;\r
                }\r
        u = n;\r
@@ -80,6 +80,6 @@ integer i_nint(x) real *x;
 integer i_nint(real *x)\r
 #endif\r
 {\r
-return( (*x)>=0 ?\r
-       floor(*x + .5) : -floor(.5 - *x) );\r
+return( (integer)((*x)>=0 ?\r
+       floor(*x + .5) : -floor(.5 - *x)) );\r
 }\r

diff --git a/libs/codec/lpc10/irc2pc.c b/libs/codec/lpc10/irc2pc.c
index 2a62881868c510f10bc4bd825c4f5d238f483a62..983432f987f367f35f187c0358ce85dd25e00c24 100644 (file)
--- a/libs/codec/lpc10/irc2pc.c
+++ b/libs/codec/lpc10/irc2pc.c
@@ -132,7 +132,7 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas
     for (i__ = 1; i__ <= i__1; ++i__) {\r
        *g2pass *= 1.f - rc[i__] * rc[i__];\r
     }\r
-    *g2pass = *gprime * sqrt(*g2pass);\r
+    *g2pass = *gprime * (real)sqrt(*g2pass);\r
     pc[1] = rc[1];\r
     i__1 = *order;\r
     for (i__ = 2; i__ <= i__1; ++i__) {\r

diff --git a/libs/codec/lpc10/liblpc10.vcproj b/libs/codec/lpc10/liblpc10.vcproj
new file mode 100644 (file)
index 0000000..56bb2ea
--- /dev/null
+++ b/libs/codec/lpc10/liblpc10.vcproj
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="liblpc10"\r
+       ProjectGUID="{FF1D238A-9D59-4850-838E-78182E05736B}"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="4"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;P_R_O_T_O_T_Y_P_E_S"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="4"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;P_R_O_T_O_T_Y_P_E_S"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\f2c.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lpc10.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath=".\analys.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\bsynz.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\chanwr.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\dcbias.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\decode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\deemp.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\difmag.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\dyptrk.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\encode.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\energy.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\f2clib.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ham84.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\hp100.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\invert.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\irc2pc.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ivfilt.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lpcdec.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lpcenc.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lpcini.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\lpfilt.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\median.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mload.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\onset.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\pitsyn.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\placea.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\placev.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\preemp.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\prepro.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\random.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\rcchk.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\synths.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\tbdm.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\voicin.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\vparms.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r

diff --git a/libs/codec/lpc10/lpc10.h b/libs/codec/lpc10/lpc10.h
index 17d04910b79240683fc2c959631c70d67ff7ef70..871a5c40c68460cc727421e2207d56d3094fcba9 100644 (file)
--- a/libs/codec/lpc10/lpc10.h
+++ b/libs/codec/lpc10/lpc10.h
@@ -46,18 +46,24 @@ Add broken lpc10 code...  It's not too far from working I don't think...
 \r
 #if defined(unix) || defined(__unix__) || defined(__NetBSD__)\r
 typedef short          INT16;\r
-typedef int            INT32;\r
+typedef int                    INT32;\r
 #endif\r
 \r
 \r
 #if defined(__MSDOS__) || defined(MSDOS)\r
-typedef int            INT16;\r
+typedef int                    INT16;\r
 typedef long           INT32;\r
 #endif\r
 \r
 #if defined(__APPLE__)\r
 typedef short          INT16;\r
-typedef int            INT32;\r
+typedef int                    INT32;\r
+#endif\r
+\r
+#if defined(WIN32) || defined(_MSC_VER)\r
+typedef __int16                INT16;\r
+typedef __int32                INT32;\r
+#pragma warning(disable: 4005)\r
 #endif\r
 \r
 \r

diff --git a/libs/codec/lpc10/onset.c b/libs/codec/lpc10/onset.c
index 1d682c1c16be5c096bdea6cd6760a32a5e849734..2281cd14bbe47141ed445e8b40858c8db82b9ffc 100644 (file)
--- a/libs/codec/lpc10/onset.c
+++ b/libs/codec/lpc10/onset.c
@@ -272,7 +272,7 @@ static real c_b2 = 1.f;
        *d__ = (r__1 * r__1 + (*d__) * 63.f) / 64.f;\r
        if ((*d__) != 0.f) {\r
            if (abs(*n) > (*d__)) {\r
-               *fpc = r_sign(&c_b2, n);\r
+               *fpc = (real)r_sign(&c_b2, n);\r
            } else {\r
                *fpc = (*n) / (*d__);\r
            }\r

diff --git a/libs/codec/lpc10/pitsyn.c b/libs/codec/lpc10/pitsyn.c
index 30d60637768cc83b65548a6ce44951e8c3a79dd5..7378c0bd93e3f0cf97e0cb6b96eda48a9d4b43d4 100644 (file)
--- a/libs/codec/lpc10/pitsyn.c
+++ b/libs/codec/lpc10/pitsyn.c
@@ -465,9 +465,9 @@ after */
            i__1 = lsamp;\r
            for (i__ = istart; i__ <= i__1; ++i__) {\r
                r__1 = *ipito + slope * i__;\r
-               ip = r__1 + .5f;\r
+               ip = (integer)(r__1 + .5f);\r
                if (uvpit != 0.f) {\r
-                   ip = uvpit;\r
+                   ip = (integer)uvpit;\r
                }\r
                if (ip <= i__ - jused) {\r
                    ++(*nout);\r
@@ -487,14 +487,14 @@ over 16. */
                    prop = (jused - ip / 2) / (real) lsamp;\r
                    i__2 = *order;\r
                    for (j = 1; j <= i__2; ++j) {\r
-                       alro = log((rco[j - 1] + 1) / (1 - rco[j - 1]));\r
-                       alrn = log((rc[j] + 1) / (1 - rc[j]));\r
+                       alro = (real)log((rco[j - 1] + 1) / (1 - rco[j - 1]));\r
+                       alrn = (real)log((rc[j] + 1) / (1 - rc[j]));\r
                        xxy = alro + prop * (alrn - alro);\r
-                       xxy = exp(xxy);\r
+                       xxy = (real)exp(xxy);\r
                        rci[j + *nout * rci_dim1] = (xxy - 1) / (xxy + 1);\r
                    }\r
-                   rmsi[*nout] = log(*rmso) + prop * (log(*rms) - log(*rmso));\r
-                   rmsi[*nout] = exp(rmsi[*nout]);\r
+                   rmsi[*nout] = (real)(log(*rmso) + prop * (log(*rms) - log(*rmso)));\r
+                   rmsi[*nout] = (real)exp(rmsi[*nout]);\r
                }\r
            }\r
            if (vflag != 1) {\r

diff --git a/libs/codec/lpc10/tbdm.c b/libs/codec/lpc10/tbdm.c
index aaca1481561fa4b77510f65aaca75f50a702608b..5071dfb0c831a2466c7a533bcce2a8f5125eed69 100644 (file)
--- a/libs/codec/lpc10/tbdm.c
+++ b/libs/codec/lpc10/tbdm.c
@@ -121,7 +121,7 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real
     difmag_(&speech[1], lpita, &tau[1], ltau, &tau[*ltau], &amdf[1], minptr, \r
            maxptr);\r
     *mintau = tau[*minptr];\r
-    minamd = amdf[*minptr];\r
+    minamd = (integer)amdf[*minptr];\r
 /*   Build table containing all lags within +/- 3 of the AMDF minimum */\r
 /*    excluding all that have already been computed */\r
     ltau2 = 0;\r
@@ -147,7 +147,7 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real
                maxp2);\r
        if (amdf2[minp2 - 1] < (real) minamd) {\r
            *mintau = tau2[minp2 - 1];\r
-           minamd = amdf2[minp2 - 1];\r
+           minamd = (integer)amdf2[minp2 - 1];\r
        }\r
     }\r
 /*   Check one octave up, if there are any lags not yet computed */\r
@@ -165,7 +165,7 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real
                maxp2);\r
        if (amdf2[minp2 - 1] < (real) minamd) {\r
            *mintau = tau2[minp2 - 1];\r
-           minamd = amdf2[minp2 - 1];\r
+           minamd = (integer)amdf2[minp2 - 1];\r
            *minptr += -20;\r
        }\r
     }\r

diff --git a/libs/codec/lpc10/voicin.c b/libs/codec/lpc10/voicin.c
index dc277e5ca0977e62bd5022aa5ded2a83d4c9c752..f72bee9c0e766c2687a5dc457ed1eabbfb5bccc7 100644 (file)
--- a/libs/codec/lpc10/voicin.c
+++ b/libs/codec/lpc10/voicin.c
@@ -778,7 +778,7 @@ d*/
 /*   NOTE: The divisor is a function of REF, the expected energies. */\r
 /* Computing MIN */\r
 /* Computing MAX */\r
-    r__2 = sqrt((real) (*lbue * *lbve)) * 64 / 3000;\r
+    r__2 = (real)(sqrt((real) (*lbue * *lbve)) * 64 / 3000);\r
     r__1 = max(r__2,1.f);\r
     *dither = min(r__1,20.f);\r
 /*   Voicing decisions are returned in VOIBUF. */\r

diff --git a/libs/codec/lpc10/vparms.c b/libs/codec/lpc10/vparms.c
index e40cbfd642c73940d21f034dab331c39004e4d15..0bb1f117de1921ee13b8a634d1640ac38db8c76b 100644 (file)
--- a/libs/codec/lpc10/vparms.c
+++ b/libs/codec/lpc10/vparms.c
@@ -194,7 +194,7 @@ static real c_b2 = 1.f;
 /* is undefined. */\r
 \r
     r__1 = inbuf[start - 1] - *dither;\r
-    oldsgn = r_sign(&c_b2, &r__1);\r
+    oldsgn = (real)r_sign(&c_b2, &r__1);\r
     i__1 = stop;\r
     for (i__ = start; i__ <= i__1; ++i__) {\r
        lp_rms__ += (r__1 = lpbuf[i__], abs(r__1));\r