add mod_ilbc

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

diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.c b/src/mod/codecs/mod_ilbc/mod_ilbc.c
index b32360e0b6914e0441caa2d25a77fd0031ddd1a3..fe3f88935857c53d4973bbdb519bcb30ec50a5f2 100644 (file)
--- a/src/mod/codecs/mod_ilbc/mod_ilbc.c
+++ b/src/mod/codecs/mod_ilbc/mod_ilbc.c
@@ -112,7 +112,8 @@ static switch_status switch_ilbc_encode(switch_codec *codec,
                unsigned int new_len = 0;
                unsigned char *edp = encoded_data;
                short *ddp = decoded_data;
-               int x, y;
+               int x;
+               uint16_t y;
                int loops = (int) decoded_data_len / context->dbytes;
                float buf[240];
 
@@ -155,7 +156,8 @@ static switch_status switch_ilbc_decode(switch_codec *codec,
                int loops = (int) encoded_data_len / context->bytes;
                unsigned char *edp = encoded_data;
                short *ddp = decoded_data;
-               int x,y;
+               int x;
+               uint16_t y;
                unsigned int new_len = 0;
                float buf[240];
 
@@ -163,7 +165,7 @@ static switch_status switch_ilbc_decode(switch_codec *codec,
                for (x = 0; x < loops && new_len < *decoded_data_len; x++) {
                        iLBC_decode(buf, edp, &context->decoder, 1);
                        for(y = 0; y < context->dbytes / sizeof(short) ; y++) {
-                               ddp[y] = buf[y];
+                               ddp[y] = (short)buf[y];
                        }
                        ddp += context->dbytes / sizeof(short);
                        edp += context->bytes;

diff --git a/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj b/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
index b5ca5e2fd2b557314a166f844f52c3544be7a32d..1800d14d2477186c141eac3eeedc646aff806a6d 100644 (file)
--- a/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
+++ b/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj
@@ -25,7 +25,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Codecilbc Debug"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_ilbc Debug"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r
@@ -108,7 +108,7 @@
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
-                               CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_Codecilbc Release"\r
+                               CommandLine="cscript /nologo $(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs Mod_ilbc Release"\r
                        />\r
                        <Tool\r
                                Name="VCCustomBuildTool"\r

diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index ad7b0fe94dac84f1e0d5b31c22cd1e3d0cceaa52..8433e2ae64ef5ea4bc710b6a409326cabdcc64fc 100644 (file)
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -151,8 +151,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Languages", "Languages", "{
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "..\..\src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}\r
                {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}\r
+               {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}\r
        EndProjectSection\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}"\r
@@ -326,7 +326,9 @@ Global
                {0E2C6395-13B9-46E5-9264-8859D346018D}.Release|Win32.ActiveCfg = Release|Win32\r
                {0E2C6395-13B9-46E5-9264-8859D346018D}.Release|Win32.Build.0 = Release|Win32\r
                {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Debug|Win32.Build.0 = Debug|Win32\r
                {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|Win32.Build.0 = Release|Win32\r
                {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.Build.0 = Debug|Win32\r
                {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.ActiveCfg = Release|Win32\r

diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index d4fb2603c4fa3acea6307680bc899a6670afbf52..208e99812742ddcb9f98cad44bcbdf9a4af7b7fb 100644 (file)
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -21,6 +21,7 @@ BuildModPortAudio=False
 BuildModSpeexCodec=False\r
 BuildModCodecG729=False\r
 BuildModCodecGSM=False\r
+BuildModilbc=False\r
 BuildModXMPPEvent=False\r
 BuildModsndfile=False\r
 BuildModpcre=False\r
@@ -82,6 +83,8 @@ If objArgs.Count >=1 Then
                        BuildModCodecG729=True\r
                Case "Mod_CodecGSM"\r
                        BuildModCodecGSM=True\r
+               Case "Mod_ilbc"\r
+                       BuildModilbc=True\r
                Case "Mod_XMPPEvent"\r
                        BuildModXMPPEvent=True\r
                Case "Mod_sndfile"\r
@@ -111,6 +114,7 @@ If objArgs.Count >=1 Then
                        BuildModzeroconf=True\r
                        BuildModSpiderMonkey=True\r
                        BuildModDingaling=True\r
+                       BuildModilbc=True\r
        End Select\r
 Else\r
        BuildCore=True\r
@@ -127,6 +131,7 @@ Else
        BuildModzeroconf=True\r
        BuildModSpiderMonkey=True\r
        BuildModDingaling=True\r
+       BuildModilbc=True\r
 End If\r
 \r
 ' ******************\r
@@ -201,6 +206,10 @@ If BuildModCodecGSM Then
        BuildLibs_libgsm BuildDebug, BuildRelease\r
 End If\r
 \r
+If BuildModilbc Then\r
+       BuildLibs_libilbc BuildDebug, BuildRelease\r
+End If\r
+\r
 If BuildModXMPPEvent Then\r
        BuildLibs_iksemel BuildDebug, BuildRelease\r
 End If\r
@@ -567,6 +576,24 @@ Sub BuildLibs_libgsm(BuildDebug, BuildRelease)
        End If \r
 End Sub\r
 \r
+\r
+Sub BuildLibs_libilbc(BuildDebug, BuildRelease)\r
+       If FSO.FolderExists(LibDestDir & "codec\ilbc") Then \r
+               If BuildDebug Then\r
+                       If Not FSO.FileExists(LibDestDir & "codec\ilbc\Debug\libilbc.lib") Then \r
+                               BuildViaVCBuild LibDestDir & "codec\ilbc\libilbc.vcproj", "Debug"\r
+                       End If\r
+               End If\r
+               If BuildRelease Then\r
+                       If Not FSO.FileExists(LibDestDir & "codec\ilbc\Release\libilbc.lib") Then \r
+                               BuildViaVCBuild LibDestDir & "codec\ilbc\libilbc.vcproj", "Release"\r
+                       End If\r
+               End If\r
+       Else\r
+               Wscript.echo "Unable to download libilbc"\r
+       End If \r
+End Sub\r
+\r
 Sub BuildLibs_SpeexCodec(BuildDebug, BuildRelease)\r
        If Not FSO.FolderExists(LibDestDir & "speex") Then \r
                WgetUnCompress "http://downloads.us.xiph.org/releases/speex/speex-1.1.11.1.tar.gz", LibDestDir\r