summaryrefslogtreecommitdiff
path: root/pjmedia
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2007-04-09 07:06:08 +0000
committerBenny Prijono <bennylp@teluu.com>2007-04-09 07:06:08 +0000
commite58d19666ee71630cbc267928b4f9cac1fa09580 (patch)
treeaa496409ed53905d577503117b3cf7a94598e461 /pjmedia
parentcf6e8a6e1d79d98378427ee60dfa099808517732 (diff)
Fixed all VS6 and VS8 projects with new third party projects layout
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1177 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
-rw-r--r--pjmedia/build/pjmedia.dsp22
-rw-r--r--pjmedia/build/pjmedia.vcproj522
-rw-r--r--pjmedia/build/pjmedia_codec.vcproj2198
-rw-r--r--pjmedia/include/pjmedia.h1
-rw-r--r--pjmedia/include/pjmedia/config.h48
-rw-r--r--pjmedia/include/pjmedia/mp3_port.h147
-rw-r--r--pjmedia/src/pjmedia-codec/gsm.c25
-rw-r--r--pjmedia/src/pjmedia/g711.c30
-rw-r--r--pjmedia/src/pjmedia/resample_resample.c526
-rw-r--r--pjmedia/src/pjmedia/resample_speex.c11
10 files changed, 138 insertions, 3392 deletions
diff --git a/pjmedia/build/pjmedia.dsp b/pjmedia/build/pjmedia.dsp
index 6846ffe5..801b96a0 100644
--- a/pjmedia/build/pjmedia.dsp
+++ b/pjmedia/build/pjmedia.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c
+# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LIB32=link.exe -lib
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /I "../src/pjmedia-codec" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjnath/include" /I "../../third_party/portaudio/include" /I "../../third_party/speex/include" /I "../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -161,10 +161,6 @@ SOURCE=..\src\pjmedia\mem_player.c
# End Source File
# Begin Source File
-SOURCE=..\src\pjmedia\mp3_writer.c
-# End Source File
-# Begin Source File
-
SOURCE=..\src\pjmedia\null_port.c
# End Source File
# Begin Source File
@@ -181,15 +177,6 @@ SOURCE=..\src\pjmedia\plc_common.c
# End Source File
# Begin Source File
-SOURCE=..\src\pjmedia\plc_steveu.c
-# ADD CPP /W2
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\plc_steveu.h
-# End Source File
-# Begin Source File
-
SOURCE=..\src\pjmedia\port.c
# End Source File
# Begin Source File
@@ -203,7 +190,6 @@ SOURCE=..\src\pjmedia\resample_resample.c
# Begin Source File
SOURCE=..\src\pjmedia\resample_speex.c
-# PROP Exclude_From_Build 1
# End Source File
# Begin Source File
@@ -339,10 +325,6 @@ SOURCE=..\include\pjmedia\mem_port.h
# End Source File
# Begin Source File
-SOURCE=..\include\pjmedia\mp3_port.h
-# End Source File
-# Begin Source File
-
SOURCE=..\include\pjmedia\null_port.h
# End Source File
# Begin Source File
diff --git a/pjmedia/build/pjmedia.vcproj b/pjmedia/build/pjmedia.vcproj
index 8a4dd066..03343089 100644
--- a/pjmedia/build/pjmedia.vcproj
+++ b/pjmedia/build/pjmedia.vcproj
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="pjmedia"
- ProjectGUID="{1434FE6C-89C6-4E13-8150-D5A4B1038AAA}"
+ ProjectGUID="{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}"
RootNamespace="pjmedia"
>
<Platforms>
@@ -43,8 +43,8 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../src/pjmedia/portaudio,../src/pjmedia-codec,../../pjnath/include"
- PreprocessorDefinitions="NDEBUG;PA_NO_ASIO;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"
+ AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../.."
+ PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -119,8 +119,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../src/pjmedia/portaudio,../src/pjmedia-codec,../../pjnath/include"
- PreprocessorDefinitions="_DEBUG;PA_NO_ASIO;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"
+ AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../.."
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -572,28 +572,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\pjmedia\mp3_writer.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\src\pjmedia\null_port.c"
>
<FileConfiguration
@@ -682,7 +660,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\pjmedia\plc_steveu.c"
+ RelativePath="..\src\pjmedia\port.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -691,7 +669,6 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
- WarningLevel="2"
/>
</FileConfiguration>
<FileConfiguration
@@ -701,16 +678,11 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
- WarningLevel="2"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\src\pjmedia\plc_steveu.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\port.c"
+ RelativePath="..\src\pjmedia\resample_port.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -732,48 +704,12 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\src\pjmedia\resample.c"
+ RelativePath="..\src\pjmedia\resample_resample.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
- RelativePath="..\src\pjmedia\resample_port.c"
+ RelativePath="..\src\pjmedia\resample_speex.c"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="..\src\pjmedia\rtcp.c"
@@ -1197,10 +1133,6 @@
>
</File>
<File
- RelativePath="..\include\pjmedia\mp3_port.h"
- >
- </File>
- <File
RelativePath="..\include\pjmedia\null_port.h"
>
</File>
@@ -1293,442 +1225,6 @@
>
</File>
</Filter>
- <Filter
- Name="PortAudio Files"
- >
- <File
- RelativePath="..\src\pjmedia\portaudio\dsound_wrapper.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\dsound_wrapper.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_allocation.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_allocation.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_converters.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_converters.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_cpuload.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_cpuload.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_dither.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_dither.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_endianness.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_front.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_hostapi.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_process.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_process.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_skeleton.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_stream.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_stream.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_trace.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_trace.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_types.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_util.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_win_ds.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_win_hostapis.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_win_util.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_win_wmme.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_win_wmme.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_x86_plain_converters.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\pa_x86_plain_converters.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\portaudio\portaudio.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resample Files"
- >
- <File
- RelativePath="..\src\pjmedia\largefilter.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia\smallfilter.h"
- >
- </File>
- </Filter>
</Files>
<Globals>
</Globals>
diff --git a/pjmedia/build/pjmedia_codec.vcproj b/pjmedia/build/pjmedia_codec.vcproj
index 661f59e0..e8e293bf 100644
--- a/pjmedia/build/pjmedia_codec.vcproj
+++ b/pjmedia/build/pjmedia_codec.vcproj
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="pjmedia_codec"
- ProjectGUID="{0545EB9B-CE7C-4EDC-86E8-FB46A8DC1236}"
+ ProjectGUID="{855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}"
>
<Platforms>
<Platform
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../include,../../pjlib/include,../src/pjmedia-codec"
+ AdditionalIncludeDirectories="../include,../../pjlib/include,../../third_party/speex/include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="../include,../../pjlib/include,../src/pjmedia-codec"
+ AdditionalIncludeDirectories="../include,../../pjlib/include,../../third_party/speex/include"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1;HAVE_CONFIG_H"
StringPooling="true"
RuntimeLibrary="2"
@@ -296,2198 +296,6 @@
>
</File>
</Filter>
- <Filter
- Name="GSM 06.10 Library"
- >
- <File
- RelativePath="..\src\pjmedia-codec\gsm\add.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\code.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\config.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\debug.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\decode.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\gsm.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\gsm_create.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\gsm_decode.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\gsm_destroy.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\gsm_encode.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\gsm_option.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\gsm_print.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\long_term.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\lpc.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\preprocess.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\private.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\proto.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\rpe.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\short_term.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="2"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\toast.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\gsm\unproto.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Speex Codec"
- >
- <Filter
- Name="Speex Header Files"
- >
- <File
- RelativePath="..\src\pjmedia-codec\speex\_kiss_fft_guts.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\arch.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\cb_search.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\cb_search_arm4.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\cb_search_bfin.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\cb_search_sse.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\config.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\fftwrap.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\filterbank.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\filters.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\filters_arm4.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\filters_bfin.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\filters_sse.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\fixed_arm4.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\fixed_arm5e.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\fixed_bfin.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\fixed_debug.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\fixed_generic.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\kiss_fft.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\kiss_fftr.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\lpc.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\lpc_bfin.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\lsp.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\ltp.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\ltp_arm4.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\ltp_bfin.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\ltp_sse.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\math_approx.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\misc.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\misc_bfin.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\modes.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\nb_celp.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\pseudofloat.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\quant_lsp.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\sb_celp.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\smallft.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_bits.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_callbacks.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_echo.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_header.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_jitter.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_preprocess.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_stereo.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_types.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\stack_alloc.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\vbr.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\vq.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\vq_arm4.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\vq_bfin.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\vq_sse.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Speex Source Files"
- >
- <File
- RelativePath="..\src\pjmedia-codec\speex\bits.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\cb_search.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\exc_10_16_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\exc_10_32_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\exc_20_32_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\exc_5_256_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\exc_5_64_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\exc_8_128_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\fftwrap.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\filterbank.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\filters.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\gain_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\gain_table_lbr.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\hexc_10_32_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\hexc_table.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\high_lsp_tables.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\jitter.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\kiss_fft.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\kiss_fftr.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\lpc_spx.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\lsp.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\lsp_tables_nb.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\ltp.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\math_approx.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\mdf.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\misc.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\modes.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\nb_celp.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\preprocess_spx.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\quant_lsp.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\sb_celp.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\smallft.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_callbacks.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\speex_header.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\stereo.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\vbr.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\vq.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\speex\window.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- WarningLevel="3"
- />
- </FileConfiguration>
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="iLBC Codec"
- >
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\anaFilter.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\anaFilter.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\constants.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\constants.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\createCB.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\createCB.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\doCPLC.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\doCPLC.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\enhancer.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\enhancer.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\filter.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\filter.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\FrameClassify.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\FrameClassify.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\gainquant.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\gainquant.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\getCBvec.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\getCBvec.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\helpfun.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\helpfun.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\hpInput.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\hpInput.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\hpOutput.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\hpOutput.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iCBConstruct.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iCBConstruct.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iCBSearch.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iCBSearch.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iLBC_decode.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iLBC_decode.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iLBC_define.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iLBC_encode.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iLBC_encode.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\iLBC_test.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\LPCdecode.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\LPCdecode.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\LPCencode.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\LPCencode.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\lsf.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\lsf.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\packing.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\packing.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\StateConstructW.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\StateConstructW.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\StateSearchW.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\StateSearchW.h"
- >
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\syntFilter.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\pjmedia-codec\ilbc\syntFilter.h"
- >
- </File>
- </Filter>
</Files>
<Globals>
</Globals>
diff --git a/pjmedia/include/pjmedia.h b/pjmedia/include/pjmedia.h
index 6db9bbe7..4a104512 100644
--- a/pjmedia/include/pjmedia.h
+++ b/pjmedia/include/pjmedia.h
@@ -38,7 +38,6 @@
#include <pjmedia/jbuf.h>
#include <pjmedia/master_port.h>
#include <pjmedia/mem_port.h>
-#include <pjmedia/mp3_port.h>
#include <pjmedia/null_port.h>
#include <pjmedia/plc.h>
#include <pjmedia/port.h>
diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h
index 2d64e0ec..23e1318d 100644
--- a/pjmedia/include/pjmedia/config.h
+++ b/pjmedia/include/pjmedia/config.h
@@ -108,22 +108,55 @@
#endif
-/**
+/*
+ * ** THIS MACRO IS DEPRECATED in 0.6. **
+ * ** See libresample for configuring this **
+ *
* Include small filter table in resample.
* This adds about 9KB in rdata.
*/
+/*
#ifndef PJMEDIA_HAS_SMALL_FILTER
# define PJMEDIA_HAS_SMALL_FILTER 1
#endif
+*/
-
-/**
+/*
+ * ** THIS MACRO IS DEPRECATED in 0.6. **
+ * ** See libresample for configuring this **
+ *
* Include large filter table in resample.
* This adds about 32KB in rdata.
*/
+/*
#ifndef PJMEDIA_HAS_LARGE_FILTER
# define PJMEDIA_HAS_LARGE_FILTER 1
#endif
+*/
+
+/**
+ * Specify whether libresample should be used for the sampling
+ * rate conversion. This macro and PJMEDIA_HAS_SPEEX_RESAMPLE
+ * are mutually exclusive.
+ *
+ * Default: 1 (Yes)
+ */
+#ifndef PJMEDIA_HAS_LIBRESAMPLE
+# define PJMEDIA_HAS_LIBRESAMPLE 1
+#endif
+
+
+/**
+ * Specify whether Speex sample rate convertor should be used for the
+ * sampling rate conversion. This macro and PJMEDIA_HAS_LIBRESAMPLE
+ * are mutually exclusive.
+ *
+ * Default: 0
+ */
+#ifndef PJMEDIA_HAS_SPEEX_RESAMPLE
+# define PJMEDIA_HAS_SPEEX_RESAMPLE 0
+#endif
+
/**
@@ -243,9 +276,14 @@
/**
* Enable Steve Underwood's PLC.
+ *
+ * ** This has now been deprecated. If the codec does not have **
+ * ** PLC, then no PLC will be used for that particular codec. **
+ *
+ * Set this to zero, or other link error will occur.
*/
#ifndef PJMEDIA_HAS_STEVEU_PLC
-# define PJMEDIA_HAS_STEVEU_PLC PJ_HAS_FLOATING_POINT
+# define PJMEDIA_HAS_STEVEU_PLC 0
#endif
@@ -275,7 +313,7 @@
* 16 will effectively zero the signal.
*/
#ifndef PJMEDIA_ECHO_SUPPRESS_FACTOR
-# define PJMEDIA_ECHO_SUPPRESS_FACTOR 4
+# define PJMEDIA_ECHO_SUPPRESS_FACTOR 10
#endif
diff --git a/pjmedia/include/pjmedia/mp3_port.h b/pjmedia/include/pjmedia/mp3_port.h
deleted file mode 100644
index a4fc7e5f..00000000
--- a/pjmedia/include/pjmedia/mp3_port.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* $Id$ */
-/*
- * Copyright (C) 2003-2007 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Contributed by:
- * Toni < buldozer at aufbix dot org >
- */
-
-#ifndef __PJMEDIA_MP3_PORT_H__
-#define __PJMEDIA_MP3_PORT_H__
-
-
-/**
- * @file mp3_port.h
- * @brief MP3 writer
- */
-#include <pjmedia/port.h>
-
-/**
- * @defgroup PJMEDIA_MP3_FILE_REC MP3 Audio File Writer (Recorder)
- * @ingroup PJMEDIA_PORT
- * @brief MP3 Audio File Writer (Recorder)
- * @{
- *
- * This section describes MP3 file writer. Currently it only works on Windows
- * using BladeEncDLL of the LAME MP3 encoder. <b>Note that the LAME_ENC.DLL
- * file must exist in the PATH so that the encoder can work properly.</b>
- *
- * The MP3 file writer is created with #pjmedia_mp3_writer_port_create() which
- * among other things specifies the desired file name and audio properties.
- * It then takes PCM input when #pjmedia_port_put_frame() is called and encode
- * the PCM input into MP3 streams before writing it to the .mp3 file.
- */
-
-
-PJ_BEGIN_DECL
-
-
-/**
- * This structure contains encoding options that can be specified during
- * MP3 writer port creation. Application should always zero the structure
- * before setting some value to make sure that default options will be used.
- */
-typedef struct pjmedia_mp3_encoder_option
-{
- /** Specify whether variable bit rate should be used. Variable bitrate
- * would normally produce better quality at the expense of probably
- * larger file.
- */
- pj_bool_t vbr;
-
- /** Target bitrate, in bps. If VBR is enabled, this settings specifies
- * the average bit-rate requested, and will make the encoder ignore
- * the quality setting. For CBR, this specifies the actual bitrate,
- * and if this option is zero, it will be set to the sampling rate
- * multiplied by number of channels.
- */
- unsigned bit_rate;
-
- /** Encoding quality, 0-9, with 0 is the highest quality. For VBR, the
- * quality setting will only take effect when bit_rate setting is zero.
- */
- unsigned quality;
-
-} pjmedia_mp3_encoder_option;
-
-
-/**
- * Create a media port to record PCM media to a MP3 file. After the port
- * is created, application can call #pjmedia_port_put_frame() to feed the
- * port with PCM frames. The port then will encode the PCM frame into MP3
- * stream, and store it to MP3 file specified in the argument.
- *
- * When application has finished with writing MP3 file, it must destroy the
- * media port with #pjmedia_port_destroy() so that the MP3 file can be
- * closed properly.
- *
- * @param pool Pool to create memory buffers for this port.
- * @param filename File name.
- * @param clock_rate The sampling rate.
- * @param channel_count Number of channels.
- * @param samples_per_frame Number of samples per frame.
- * @param bits_per_sample Number of bits per sample (eg 16).
- * @param option Optional option to set encoding parameters.
- * @param p_port Pointer to receive the file port instance.
- *
- * @return PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t)
-pjmedia_mp3_writer_port_create(pj_pool_t *pool,
- const char *filename,
- unsigned clock_rate,
- unsigned channel_count,
- unsigned samples_per_frame,
- unsigned bits_per_sample,
- const pjmedia_mp3_encoder_option *option,
- pjmedia_port **p_port );
-
-/**
- * Register the callback to be called when the file writing has reached
- * certain size. Application can use this callback, for example, to limit
- * the size of the output file.
- *
- * @param port The file writer port.
- * @param pos The file position on which the callback will be called.
- * @param user_data User data to be specified in the callback, and will be
- * given on the callback.
- * @param cb Callback to be called. If the callback returns non-
- * PJ_SUCCESS, the writing will stop. Note that if
- * application destroys the port in the callback, it must
- * return non-PJ_SUCCESS here.
- *
- * @return PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t)
-pjmedia_mp3_writer_port_set_cb( pjmedia_port *port,
- pj_size_t pos,
- void *user_data,
- pj_status_t (*cb)(pjmedia_port *port,
- void *usr_data));
-
-
-/**
- * @}
- */
-
-
-PJ_END_DECL
-
-#endif /* __PJMEDIA_MP3_PORT_H__ */
-
diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c
index 34f538b2..d21956ae 100644
--- a/pjmedia/src/pjmedia-codec/gsm.c
+++ b/pjmedia/src/pjmedia-codec/gsm.c
@@ -34,6 +34,9 @@
*/
#if defined(PJMEDIA_HAS_GSM_CODEC) && PJMEDIA_HAS_GSM_CODEC != 0
+/* We removed PLC in 0.6 */
+#define PLC_DISABLED 1
+
/* Prototypes for GSM factory */
static pj_status_t gsm_test_alloc( pjmedia_codec_factory *factory,
@@ -72,9 +75,11 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec,
const struct pjmedia_frame *input,
unsigned output_buf_len,
struct pjmedia_frame *output);
+#if !PLC_DISABLED
static pj_status_t gsm_codec_recover(pjmedia_codec *codec,
unsigned output_buf_len,
struct pjmedia_frame *output);
+#endif
/* Definition for GSM codec operations. */
static pjmedia_codec_op gsm_op =
@@ -86,7 +91,11 @@ static pjmedia_codec_op gsm_op =
&gsm_codec_parse,
&gsm_codec_encode,
&gsm_codec_decode,
+#if !PLC_DISABLED
&gsm_codec_recover
+#else
+ NULL
+#endif
};
/* Definition for GSM codec factory operations. */
@@ -116,7 +125,9 @@ struct gsm_data
void *encoder;
void *decoder;
pj_bool_t plc_enabled;
+#if !PLC_DISABLED
pjmedia_plc *plc;
+#endif
pj_bool_t vad_enabled;
pjmedia_silence_det *vad;
pj_timestamp last_tx;
@@ -259,7 +270,9 @@ static pj_status_t gsm_default_attr (pjmedia_codec_factory *factory,
attr->setting.frm_per_pkt = 1;
attr->setting.vad = 1;
+#if !PLC_DISABLED
attr->setting.plc = 1;
+#endif
/* Default all other flag bits disabled. */
@@ -320,6 +333,7 @@ static pj_status_t gsm_alloc_codec( pjmedia_codec_factory *factory,
sizeof(struct gsm_data));
codec->codec_data = gsm_data;
+#if !PLC_DISABLED
/* Create PLC */
status = pjmedia_plc_create(gsm_codec_factory.pool, 8000,
160, 0, &gsm_data->plc);
@@ -327,6 +341,7 @@ static pj_status_t gsm_alloc_codec( pjmedia_codec_factory *factory,
pj_mutex_unlock(gsm_codec_factory.mutex);
return status;
}
+#endif
/* Create silence detector */
status = pjmedia_silence_det_create(gsm_codec_factory.pool,
@@ -351,7 +366,6 @@ static pj_status_t gsm_dealloc_codec( pjmedia_codec_factory *factory,
pjmedia_codec *codec )
{
struct gsm_data *gsm_data;
- pj_int16_t frame[160];
int i;
PJ_ASSERT_RETURN(factory && codec, PJ_EINVAL);
@@ -362,13 +376,18 @@ static pj_status_t gsm_dealloc_codec( pjmedia_codec_factory *factory,
/* Close codec, if it's not closed. */
gsm_codec_close(codec);
+#if !PLC_DISABLED
/* Clear left samples in the PLC, since codec+plc will be reused
* next time.
*/
for (i=0; i<2; ++i) {
+ pj_int16_t frame[160];
pjmedia_zero_samples(frame, PJ_ARRAY_SIZE(frame));
pjmedia_plc_save(gsm_data->plc, frame);
}
+#else
+ PJ_UNUSED_ARG(i);
+#endif
/* Re-init silence_period */
pj_set_timestamp32(&gsm_data->last_tx, 0, 0);
@@ -569,13 +588,16 @@ static pj_status_t gsm_codec_decode( pjmedia_codec *codec,
output->size = 320;
output->type = PJMEDIA_FRAME_TYPE_AUDIO;
+#if !PLC_DISABLED
if (gsm_data->plc_enabled)
pjmedia_plc_save( gsm_data->plc, output->buf);
+#endif
return PJ_SUCCESS;
}
+#if !PLC_DISABLED
/*
* Recover lost frame.
*/
@@ -594,6 +616,7 @@ static pj_status_t gsm_codec_recover(pjmedia_codec *codec,
return PJ_SUCCESS;
}
+#endif
#endif /* PJMEDIA_HAS_GSM_CODEC */
diff --git a/pjmedia/src/pjmedia/g711.c b/pjmedia/src/pjmedia/g711.c
index 38306d0b..da9b7586 100644
--- a/pjmedia/src/pjmedia/g711.c
+++ b/pjmedia/src/pjmedia/g711.c
@@ -32,6 +32,9 @@
#if defined(PJMEDIA_HAS_G711_CODEC) && PJMEDIA_HAS_G711_CODEC!=0
+/* We removed PLC in 0.6 */
+#define PLC_DISABLED 1
+
#define G711_BPS 64000
#define G711_CODEC_CNT 0 /* number of codec to preallocate in memory */
@@ -80,9 +83,11 @@ static pj_status_t g711_decode( pjmedia_codec *codec,
const struct pjmedia_frame *input,
unsigned output_buf_len,
struct pjmedia_frame *output);
+#if !PLC_DISABLED
static pj_status_t g711_recover( pjmedia_codec *codec,
unsigned output_buf_len,
struct pjmedia_frame *output);
+#endif
/* Definition for G711 codec operations. */
static pjmedia_codec_op g711_op =
@@ -94,7 +99,11 @@ static pjmedia_codec_op g711_op =
&g711_parse,
&g711_encode,
&g711_decode,
+#if !PLC_DISABLED
&g711_recover
+#else
+ NULL
+#endif
};
/* Definition for G711 codec factory operations. */
@@ -121,8 +130,10 @@ static struct g711_factory
struct g711_private
{
unsigned pt;
+#if !PLC_DISABLED
pj_bool_t plc_enabled;
pjmedia_plc *plc;
+#endif
pj_bool_t vad_enabled;
pjmedia_silence_det *vad;
pj_timestamp last_tx;
@@ -249,8 +260,10 @@ static pj_status_t g711_default_attr (pjmedia_codec_factory *factory,
/* Set default frames per packet to 2 (or 20ms) */
attr->setting.frm_per_pkt = 2;
+#if !PLC_DISABLED
/* Enable plc by default. */
attr->setting.plc = 1;
+#endif
/* Enable VAD by default. */
attr->setting.vad = 1;
@@ -317,6 +330,7 @@ static pj_status_t g711_alloc_codec( pjmedia_codec_factory *factory,
/* Set the payload type */
codec_priv->pt = id->pt;
+#if !PLC_DISABLED
/* Create PLC, always with 10ms ptime */
status = pjmedia_plc_create(g711_factory.pool, 8000, 80,
0, &codec_priv->plc);
@@ -324,6 +338,7 @@ static pj_status_t g711_alloc_codec( pjmedia_codec_factory *factory,
pj_mutex_unlock(g711_factory.mutex);
return status;
}
+#endif
/* Create VAD */
status = pjmedia_silence_det_create(g711_factory.pool,
@@ -357,7 +372,6 @@ static pj_status_t g711_dealloc_codec(pjmedia_codec_factory *factory,
pjmedia_codec *codec )
{
struct g711_private *priv = codec->codec_data;
- pj_int16_t frame[SAMPLES_PER_FRAME];
int i;
PJ_ASSERT_RETURN(factory==&g711_factory.base, PJ_EINVAL);
@@ -368,13 +382,19 @@ static pj_status_t g711_dealloc_codec(pjmedia_codec_factory *factory,
return PJ_EINVALIDOP;
}
+#if !PLC_DISABLED
/* Clear left samples in the PLC, since codec+plc will be reused
* next time.
*/
for (i=0; i<2; ++i) {
+ pj_int16_t frame[SAMPLES_PER_FRAME];
pjmedia_zero_samples(frame, PJ_ARRAY_SIZE(frame));
pjmedia_plc_save(priv->plc, frame);
}
+#else
+ PJ_UNUSED_ARG(i);
+ PJ_UNUSED_ARG(priv);
+#endif
/* Lock mutex. */
pj_mutex_lock(g711_factory.mutex);
@@ -402,7 +422,9 @@ static pj_status_t g711_open(pjmedia_codec *codec,
{
struct g711_private *priv = codec->codec_data;
priv->pt = attr->info.pt;
+#if !PLC_DISABLED
priv->plc_enabled = (attr->setting.plc != 0);
+#endif
priv->vad_enabled = (attr->setting.vad != 0);
return PJ_SUCCESS;
}
@@ -422,7 +444,9 @@ static pj_status_t g711_modify(pjmedia_codec *codec,
if (attr->info.pt != priv->pt)
return PJMEDIA_EINVALIDPT;
+#if !PLC_DISABLED
priv->plc_enabled = (attr->setting.plc != 0);
+#endif
priv->vad_enabled = (attr->setting.vad != 0);
return PJ_SUCCESS;
@@ -561,12 +585,15 @@ static pj_status_t g711_decode(pjmedia_codec *codec,
output->type = PJMEDIA_FRAME_TYPE_AUDIO;
output->size = (input->size << 1);
+#if !PLC_DISABLED
if (priv->plc_enabled)
pjmedia_plc_save( priv->plc, output->buf);
+#endif
return PJ_SUCCESS;
}
+#if !PLC_DISABLED
static pj_status_t g711_recover( pjmedia_codec *codec,
unsigned output_buf_len,
struct pjmedia_frame *output)
@@ -584,6 +611,7 @@ static pj_status_t g711_recover( pjmedia_codec *codec,
return PJ_SUCCESS;
}
+#endif
#endif /* PJMEDIA_HAS_G711_CODEC */
diff --git a/pjmedia/src/pjmedia/resample_resample.c b/pjmedia/src/pjmedia/resample_resample.c
index fbb4a727..0dc755d9 100644
--- a/pjmedia/src/pjmedia/resample_resample.c
+++ b/pjmedia/src/pjmedia/resample_resample.c
@@ -17,451 +17,21 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/*
- * Based on:
- * resample-1.8.tar.gz from the
- * Digital Audio Resampling Home Page located at
- * http://www-ccrma.stanford.edu/~jos/resample/.
- *
- * SOFTWARE FOR SAMPLING-RATE CONVERSION AND FIR DIGITAL FILTER DESIGN
- *
- * Snippet from the resample.1 man page:
- *
- * HISTORY
- *
- * The first version of this software was written by Julius O. Smith III
- * <jos@ccrma.stanford.edu> at CCRMA <http://www-ccrma.stanford.edu> in
- * 1981. It was called SRCONV and was written in SAIL for PDP-10
- * compatible machines. The algorithm was first published in
- *
- * Smith, Julius O. and Phil Gossett. ``A Flexible Sampling-Rate
- * Conversion Method,'' Proceedings (2): 19.4.1-19.4.4, IEEE Conference
- * on Acoustics, Speech, and Signal Processing, San Diego, March 1984.
- *
- * An expanded tutorial based on this paper is available at the Digital
- * Audio Resampling Home Page given above.
- *
- * Circa 1988, the SRCONV program was translated from SAIL to C by
- * Christopher Lee Fraley working with Roger Dannenberg at CMU.
- *
- * Since then, the C version has been maintained by jos.
- *
- * Sndlib support was added 6/99 by John Gibson <jgg9c@virginia.edu>.
- *
- * The resample program is free software distributed in accordance
- * with the Lesser GNU Public License (LGPL). There is NO warranty; not
- * even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* PJMEDIA modification:
- * - remove resample(), just use SrcUp, SrcUD, and SrcLinear directly.
- * - move FilterUp() and FilterUD() from filterkit.c
- * - move stddefs.h and resample.h to this file.
- * - const correctness.
- */
#include <pjmedia/resample.h>
+
#include <pjmedia/errno.h>
#include <pj/assert.h>
#include <pj/log.h>
#include <pj/pool.h>
-#define THIS_FILE "resample.c"
-
-
-/*
- * Taken from stddefs.h
- */
-#ifndef PI
-#define PI (3.14159265358979232846)
-#endif
-
-#ifndef PI2
-#define PI2 (6.28318530717958465692)
-#endif
-
-#define D2R (0.01745329348) /* (2*pi)/360 */
-#define R2D (57.29577951) /* 360/(2*pi) */
-
-#ifndef MAX
-#define MAX(x,y) ((x)>(y) ?(x):(y))
-#endif
-#ifndef MIN
-#define MIN(x,y) ((x)<(y) ?(x):(y))
-#endif
-
-#ifndef ABS
-#define ABS(x) ((x)<0 ?(-(x)):(x))
-#endif
-
-#ifndef SGN
-#define SGN(x) ((x)<0 ?(-1):((x)==0?(0):(1)))
-#endif
-
-typedef char RES_BOOL;
-typedef short RES_HWORD;
-typedef int RES_WORD;
-typedef unsigned short RES_UHWORD;
-typedef unsigned int RES_UWORD;
-
-#define MAX_HWORD (32767)
-#define MIN_HWORD (-32768)
-
-#ifdef DEBUG
-#define INLINE
-#else
-#define INLINE inline
-#endif
-
-/*
- * Taken from resample.h
- *
- * The configuration constants below govern
- * the number of bits in the input sample and filter coefficients, the
- * number of bits to the right of the binary-point for fixed-point math, etc.
- *
- */
-
-/* Conversion constants */
-#define Nhc 8
-#define Na 7
-#define Np (Nhc+Na)
-#define Npc (1<<Nhc)
-#define Amask ((1<<Na)-1)
-#define Pmask ((1<<Np)-1)
-#define Nh 16
-#define Nb 16
-#define Nhxn 14
-#define Nhg (Nh-Nhxn)
-#define NLpScl 13
-
-/* Description of constants:
- *
- * Npc - is the number of look-up values available for the lowpass filter
- * between the beginning of its impulse response and the "cutoff time"
- * of the filter. The cutoff time is defined as the reciprocal of the
- * lowpass-filter cut off frequence in Hz. For example, if the
- * lowpass filter were a sinc function, Npc would be the index of the
- * impulse-response lookup-table corresponding to the first zero-
- * crossing of the sinc function. (The inverse first zero-crossing
- * time of a sinc function equals its nominal cutoff frequency in Hz.)
- * Npc must be a power of 2 due to the details of the current
- * implementation. The default value of 512 is sufficiently high that
- * using linear interpolation to fill in between the table entries
- * gives approximately 16-bit accuracy in filter coefficients.
- *
- * Nhc - is log base 2 of Npc.
- *
- * Na - is the number of bits devoted to linear interpolation of the
- * filter coefficients.
- *
- * Np - is Na + Nhc, the number of bits to the right of the binary point
- * in the integer "time" variable. To the left of the point, it indexes
- * the input array (X), and to the right, it is interpreted as a number
- * between 0 and 1 sample of the input X. Np must be less than 16 in
- * this implementation.
- *
- * Nh - is the number of bits in the filter coefficients. The sum of Nh and
- * the number of bits in the input data (typically 16) cannot exceed 32.
- * Thus Nh should be 16. The largest filter coefficient should nearly
- * fill 16 bits (32767).
- *
- * Nb - is the number of bits in the input data. The sum of Nb and Nh cannot
- * exceed 32.
- *
- * Nhxn - is the number of bits to right shift after multiplying each input
- * sample times a filter coefficient. It can be as great as Nh and as
- * small as 0. Nhxn = Nh-2 gives 2 guard bits in the multiply-add
- * accumulation. If Nhxn=0, the accumulation will soon overflow 32 bits.
- *
- * Nhg - is the number of guard bits in mpy-add accumulation (equal to Nh-Nhxn)
- *
- * NLpScl - is the number of bits allocated to the unity-gain normalization
- * factor. The output of the lowpass filter is multiplied by LpScl and
- * then right-shifted NLpScl bits. To avoid overflow, we must have
- * Nb+Nhg+NLpScl < 32.
- */
-
-
-#ifdef _MSC_VER
-# pragma warning(push, 3)
-//# pragma warning(disable: 4245) // Conversion from uint to ushort
-# pragma warning(disable: 4244) // Conversion from double to uint
-# pragma warning(disable: 4146) // unary minus operator applied to unsigned type, result still unsigned
-# pragma warning(disable: 4761) // integral size mismatch in argument; conversion supplied
-#endif
-
-#if defined(PJMEDIA_HAS_SMALL_FILTER) && PJMEDIA_HAS_SMALL_FILTER!=0
-# include "smallfilter.h"
-#else
-# define SMALL_FILTER_NMULT 0
-# define SMALL_FILTER_SCALE 0
-# define SMALL_FILTER_NWING 0
-# define SMALL_FILTER_IMP NULL
-# define SMALL_FILTER_IMPD NULL
-#endif
-
-#if defined(PJMEDIA_HAS_LARGE_FILTER) && PJMEDIA_HAS_LARGE_FILTER!=0
-# include "largefilter.h"
-#else
-# define LARGE_FILTER_NMULT 0
-# define LARGE_FILTER_SCALE 0
-# define LARGE_FILTER_NWING 0
-# define LARGE_FILTER_IMP NULL
-# define LARGE_FILTER_IMPD NULL
-#endif
-
-
-#undef INLINE
-#define INLINE
-#define HAVE_FILTER 0
-
-#ifndef NULL
-# define NULL 0
-#endif
-
-
-static INLINE RES_HWORD WordToHword(RES_WORD v, int scl)
-{
- RES_HWORD out;
- RES_WORD llsb = (1<<(scl-1));
- v += llsb; /* round */
- v >>= scl;
- if (v>MAX_HWORD) {
- v = MAX_HWORD;
- } else if (v < MIN_HWORD) {
- v = MIN_HWORD;
- }
- out = (RES_HWORD) v;
- return out;
-}
+#if defined(PJMEDIA_HAS_LIBRESAMPLE) && PJMEDIA_HAS_LIBRESAMPLE != 0
-/* Sampling rate conversion using linear interpolation for maximum speed.
- */
-static int
- SrcLinear(const RES_HWORD X[], RES_HWORD Y[], double pFactor, RES_UHWORD nx)
-{
- RES_HWORD iconst;
- RES_UWORD time = 0;
- const RES_HWORD *xp;
- RES_HWORD *Ystart, *Yend;
- RES_WORD v,x1,x2;
-
- double dt; /* Step through input signal */
- RES_UWORD dtb; /* Fixed-point version of Dt */
- RES_UWORD endTime; /* When time reaches EndTime, return to user */
-
- dt = 1.0/pFactor; /* Output sampling period */
- dtb = dt*(1<<Np) + 0.5; /* Fixed-point representation */
-
- Ystart = Y;
- Yend = Ystart + (unsigned)(nx * pFactor);
- endTime = time + (1<<Np)*(RES_WORD)nx;
- while (time < endTime)
- {
- iconst = (time) & Pmask;
- xp = &X[(time)>>Np]; /* Ptr to current input sample */
- x1 = *xp++;
- x2 = *xp;
- x1 *= ((1<<Np)-iconst);
- x2 *= iconst;
- v = x1 + x2;
- *Y++ = WordToHword(v,Np); /* Deposit output */
- time += dtb; /* Move to next sample by time increment */
- }
- return (Y - Ystart); /* Return number of output samples */
-}
+#include <third_party/resample/include/resamplesubs.h>
-static RES_WORD FilterUp(const RES_HWORD Imp[], const RES_HWORD ImpD[],
- RES_UHWORD Nwing, RES_BOOL Interp,
- const RES_HWORD *Xp, RES_HWORD Ph, RES_HWORD Inc)
-{
- const RES_HWORD *Hp;
- const RES_HWORD *Hdp = NULL;
- const RES_HWORD *End;
- RES_HWORD a = 0;
- RES_WORD v, t;
-
- v=0;
- Hp = &Imp[Ph>>Na];
- End = &Imp[Nwing];
- if (Interp) {
- Hdp = &ImpD[Ph>>Na];
- a = Ph & Amask;
- }
- if (Inc == 1) /* If doing right wing... */
- { /* ...drop extra coeff, so when Ph is */
- End--; /* 0.5, we don't do too many mult's */
- if (Ph == 0) /* If the phase is zero... */
- { /* ...then we've already skipped the */
- Hp += Npc; /* first sample, so we must also */
- Hdp += Npc; /* skip ahead in Imp[] and ImpD[] */
- }
- }
- if (Interp)
- while (Hp < End) {
- t = *Hp; /* Get filter coeff */
- t += (((RES_WORD)*Hdp)*a)>>Na; /* t is now interp'd filter coeff */
- Hdp += Npc; /* Filter coeff differences step */
- t *= *Xp; /* Mult coeff by input sample */
- if (t & (1<<(Nhxn-1))) /* Round, if needed */
- t += (1<<(Nhxn-1));
- t >>= Nhxn; /* Leave some guard bits, but come back some */
- v += t; /* The filter output */
- Hp += Npc; /* Filter coeff step */
-
- Xp += Inc; /* Input signal step. NO CHECK ON BOUNDS */
- }
- else
- while (Hp < End) {
- t = *Hp; /* Get filter coeff */
- t *= *Xp; /* Mult coeff by input sample */
- if (t & (1<<(Nhxn-1))) /* Round, if needed */
- t += (1<<(Nhxn-1));
- t >>= Nhxn; /* Leave some guard bits, but come back some */
- v += t; /* The filter output */
- Hp += Npc; /* Filter coeff step */
- Xp += Inc; /* Input signal step. NO CHECK ON BOUNDS */
- }
- return(v);
-}
-
-
-static RES_WORD FilterUD(const RES_HWORD Imp[], const RES_HWORD ImpD[],
- RES_UHWORD Nwing, RES_BOOL Interp,
- const RES_HWORD *Xp, RES_HWORD Ph, RES_HWORD Inc, RES_UHWORD dhb)
-{
- RES_HWORD a;
- const RES_HWORD *Hp, *Hdp, *End;
- RES_WORD v, t;
- RES_UWORD Ho;
-
- v=0;
- Ho = (Ph*(RES_UWORD)dhb)>>Np;
- End = &Imp[Nwing];
- if (Inc == 1) /* If doing right wing... */
- { /* ...drop extra coeff, so when Ph is */
- End--; /* 0.5, we don't do too many mult's */
- if (Ph == 0) /* If the phase is zero... */
- Ho += dhb; /* ...then we've already skipped the */
- } /* first sample, so we must also */
- /* skip ahead in Imp[] and ImpD[] */
- if (Interp)
- while ((Hp = &Imp[Ho>>Na]) < End) {
- t = *Hp; /* Get IR sample */
- Hdp = &ImpD[Ho>>Na]; /* get interp (lower Na) bits from diff table*/
- a = Ho & Amask; /* a is logically between 0 and 1 */
- t += (((RES_WORD)*Hdp)*a)>>Na; /* t is now interp'd filter coeff */
- t *= *Xp; /* Mult coeff by input sample */
- if (t & 1<<(Nhxn-1)) /* Round, if needed */
- t += 1<<(Nhxn-1);
- t >>= Nhxn; /* Leave some guard bits, but come back some */
- v += t; /* The filter output */
- Ho += dhb; /* IR step */
- Xp += Inc; /* Input signal step. NO CHECK ON BOUNDS */
- }
- else
- while ((Hp = &Imp[Ho>>Na]) < End) {
- t = *Hp; /* Get IR sample */
- t *= *Xp; /* Mult coeff by input sample */
- if (t & 1<<(Nhxn-1)) /* Round, if needed */
- t += 1<<(Nhxn-1);
- t >>= Nhxn; /* Leave some guard bits, but come back some */
- v += t; /* The filter output */
- Ho += dhb; /* IR step */
- Xp += Inc; /* Input signal step. NO CHECK ON BOUNDS */
- }
- return(v);
-}
-
-/* Sampling rate up-conversion only subroutine;
- * Slightly faster than down-conversion;
- */
-static int SrcUp(const RES_HWORD X[], RES_HWORD Y[], double pFactor,
- RES_UHWORD nx, RES_UHWORD pNwing, RES_UHWORD pLpScl,
- const RES_HWORD pImp[], const RES_HWORD pImpD[], RES_BOOL Interp)
-{
- const RES_HWORD *xp;
- RES_HWORD *Ystart, *Yend;
- RES_WORD v;
-
- double dt; /* Step through input signal */
- RES_UWORD dtb; /* Fixed-point version of Dt */
- RES_UWORD time = 0;
- RES_UWORD endTime; /* When time reaches EndTime, return to user */
-
- dt = 1.0/pFactor; /* Output sampling period */
- dtb = dt*(1<<Np) + 0.5; /* Fixed-point representation */
-
- Ystart = Y;
- Yend = Ystart + (unsigned)(nx * pFactor);
- endTime = time + (1<<Np)*(RES_WORD)nx;
- while (time < endTime)
- {
- xp = &X[time>>Np]; /* Ptr to current input sample */
- /* Perform left-wing inner product */
- v = 0;
- v = FilterUp(pImp, pImpD, pNwing, Interp, xp, (RES_HWORD)(time&Pmask),-1);
-
- /* Perform right-wing inner product */
- v += FilterUp(pImp, pImpD, pNwing, Interp, xp+1, (RES_HWORD)((-time)&Pmask),1);
-
- v >>= Nhg; /* Make guard bits */
- v *= pLpScl; /* Normalize for unity filter gain */
- *Y++ = WordToHword(v,NLpScl); /* strip guard bits, deposit output */
- time += dtb; /* Move to next sample by time increment */
- }
- return (Y - Ystart); /* Return the number of output samples */
-}
+#define THIS_FILE "resample.c"
-/* Sampling rate conversion subroutine */
-
-static int SrcUD(const RES_HWORD X[], RES_HWORD Y[], double pFactor,
- RES_UHWORD nx, RES_UHWORD pNwing, RES_UHWORD pLpScl,
- const RES_HWORD pImp[], const RES_HWORD pImpD[], RES_BOOL Interp)
-{
- const RES_HWORD *xp;
- RES_HWORD *Ystart, *Yend;
- RES_WORD v;
-
- double dh; /* Step through filter impulse response */
- double dt; /* Step through input signal */
- RES_UWORD time = 0;
- RES_UWORD endTime; /* When time reaches EndTime, return to user */
- RES_UWORD dhb, dtb; /* Fixed-point versions of Dh,Dt */
-
- dt = 1.0/pFactor; /* Output sampling period */
- dtb = dt*(1<<Np) + 0.5; /* Fixed-point representation */
-
- dh = MIN(Npc, pFactor*Npc); /* Filter sampling period */
- dhb = dh*(1<<Na) + 0.5; /* Fixed-point representation */
-
- Ystart = Y;
- Yend = Ystart + (unsigned)(nx * pFactor);
- endTime = time + (1<<Np)*(RES_WORD)nx;
- while (time < endTime)
- {
- xp = &X[time>>Np]; /* Ptr to current input sample */
- v = FilterUD(pImp, pImpD, pNwing, Interp, xp, (RES_HWORD)(time&Pmask),
- -1, dhb); /* Perform left-wing inner product */
- v += FilterUD(pImp, pImpD, pNwing, Interp, xp+1, (RES_HWORD)((-time)&Pmask),
- 1, dhb); /* Perform right-wing inner product */
- v >>= Nhg; /* Make guard bits */
- v *= pLpScl; /* Normalize for unity filter gain */
- *Y++ = WordToHword(v,NLpScl); /* strip guard bits, deposit output */
- time += dtb; /* Move to next sample by time increment */
- }
- return (Y - Ystart); /* Return the number of output samples */
-}
-
-
-/* ***************************************************************************
- *
- * PJMEDIA RESAMPLE
- *
- * ***************************************************************************
- */
struct pjmedia_resample
{
@@ -503,31 +73,6 @@ PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool,
//high_quality = 0;
}
-#if !defined(PJMEDIA_HAS_LARGE_FILTER) || PJMEDIA_HAS_LARGE_FILTER==0
- /*
- * If large filter is excluded in the build, then prevent application
- * from using it.
- */
- if (high_quality && large_filter) {
- large_filter = PJ_FALSE;
- PJ_LOG(5,(THIS_FILE,
- "Resample uses small filter because large filter is "
- "disabled"));
- }
-#endif
-
-#if !defined(PJMEDIA_HAS_SMALL_FILTER) || PJMEDIA_HAS_SMALL_FILTER==0
- /*
- * If small filter is excluded in the build and application wants to
- * use it, then drop to linear conversion.
- */
- if (high_quality && large_filter == 0) {
- high_quality = PJ_FALSE;
- PJ_LOG(4,(THIS_FILE,
- "Resample uses linear because small filter is disabled"));
- }
-#endif
-
resample->factor = rate_out * 1.0 / rate_in;
resample->large_filter = large_filter;
resample->high_quality = high_quality;
@@ -540,13 +85,7 @@ PJ_DEF(pj_status_t) pjmedia_resample_create( pj_pool_t *pool,
* of Macadamian dot com.
* resample->xoff = large_filter ? 32 : 6;
*/
- if (large_filter)
- resample->xoff = (LARGE_FILTER_NMULT + 1) / 2.0 *
- MAX(1.0, 1.0/resample->factor);
- else
- resample->xoff = (SMALL_FILTER_NMULT + 1) / 2.0 *
- MAX(1.0, 1.0/resample->factor);
-
+ resample->xoff = res_GetXOFF(resample->factor, (char)large_filter);
size = (samples_per_frame + 2*resample->xoff) * sizeof(pj_int16_t);
resample->buffer = pj_pool_alloc(pool, size);
@@ -649,53 +188,18 @@ PJ_DEF(void) pjmedia_resample_run( pjmedia_resample *resample,
*/
dst_buf = resample->buffer + resample->xoff*2;
pjmedia_copy_samples(dst_buf, input, resample->frame_size);
-
- if (resample->factor >= 1) {
-
- if (resample->large_filter) {
- SrcUp(resample->buffer + resample->xoff, output,
- resample->factor, resample->frame_size,
- LARGE_FILTER_NWING, LARGE_FILTER_SCALE,
- LARGE_FILTER_IMP, LARGE_FILTER_IMPD,
- PJ_TRUE);
- } else {
- SrcUp(resample->buffer + resample->xoff, output,
- resample->factor, resample->frame_size,
- SMALL_FILTER_NWING, SMALL_FILTER_SCALE,
- SMALL_FILTER_IMP, SMALL_FILTER_IMPD,
- PJ_TRUE);
- }
-
- } else {
-
- if (resample->large_filter) {
-
- SrcUD( resample->buffer + resample->xoff, output,
- resample->factor, resample->frame_size,
- LARGE_FILTER_NWING,
- LARGE_FILTER_SCALE * resample->factor + 0.5,
- LARGE_FILTER_IMP, LARGE_FILTER_IMPD,
- PJ_TRUE);
-
- } else {
-
- SrcUD( resample->buffer + resample->xoff, output,
- resample->factor, resample->frame_size,
- SMALL_FILTER_NWING,
- SMALL_FILTER_SCALE * resample->factor + 0.5,
- SMALL_FILTER_IMP, SMALL_FILTER_IMPD,
- PJ_TRUE);
-
- }
-
- }
+
+ res_Resample(resample->buffer + resample->xoff, output,
+ resample->factor, (pj_uint16_t)resample->frame_size,
+ (char)resample->large_filter, (char)PJ_TRUE);
dst_buf = resample->buffer;
src_buf = input + resample->frame_size - resample->xoff*2;
pjmedia_copy_samples(dst_buf, src_buf, resample->xoff * 2);
} else {
- SrcLinear( input, output, resample->factor, resample->frame_size);
+ res_SrcLinear( input, output, resample->factor,
+ (pj_uint16_t)resample->frame_size);
}
}
@@ -709,3 +213,11 @@ PJ_DEF(void) pjmedia_resample_destroy(pjmedia_resample *resample)
{
PJ_UNUSED_ARG(resample);
}
+
+
+#else /* PJMEDIA_HAS_LIBRESAMPLE */
+
+int pjmedia_resample_resample_excluded;
+
+#endif /* PJMEDIA_HAS_LIBRESAMPLE */
+
diff --git a/pjmedia/src/pjmedia/resample_speex.c b/pjmedia/src/pjmedia/resample_speex.c
index 447d3f6a..fcc42115 100644
--- a/pjmedia/src/pjmedia/resample_speex.c
+++ b/pjmedia/src/pjmedia/resample_speex.c
@@ -16,16 +16,17 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
#include <pjmedia/resample.h>
#include <pjmedia/errno.h>
#include <pj/assert.h>
#include <pj/log.h>
#include <pj/pool.h>
+#if defined(PJMEDIA_HAS_SPEEX_RESAMPLE) && PJMEDIA_HAS_SPEEX_RESAMPLE != 0
+
#include <speex/speex_resampler.h>
-#define THIS_FILE "resample.c"
+#define THIS_FILE "resample_speex.c"
struct pjmedia_resample
@@ -117,3 +118,9 @@ PJ_DEF(void) pjmedia_resample_destroy(pjmedia_resample *resample)
}
}
+#else /* PJMEDIA_HAS_SPEEX_RESAMPLE */
+
+int pjmedia_resample_speex_excluded;
+
+#endif /* PJMEDIA_HAS_SPEEX_RESAMPLE */
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 21:09:15 +0000