Ticket #774:

 - Initial source of G.722.1/Annex C integration.
 - Disabled some "odd" modes of L16 codec (11kHz & 22kHz mono & stereo) while releasing some payload types.



git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2563 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 667 insertions, 0 deletions

diff --git a/third_party/build/g7221/libg7221.dsp b/third_party/build/g7221/libg7221.dsp
new file mode 100644
index 00000000..cea72849
--- /dev/null
+++ b/third_party/build/g7221/libg7221.dsp
@@ -0,0 +1,190 @@
+# Microsoft Developer Studio Project File - Name="libg7221" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=libg7221 - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "libg7221.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "libg7221.mak" CFG="libg7221 - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "libg7221 - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "libg7221 - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "libg7221 - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "output\libg7221-i386-win32-vc6-release"

+# PROP Intermediate_Dir "output\libg7221-i386-win32-vc6-release"

+# 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 /W3 /GX /O2 /I "../.." /I "../../g7221/common" /I "../../g7221/common/stl-files" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"..\..\lib\libg7221-i386-win32-vc6-release.lib"

+

+!ELSEIF  "$(CFG)" == "libg7221 - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "output\libg7221-i386-win32-vc6-debug"

+# PROP Intermediate_Dir "output\libg7221-i386-win32-vc6-debug"

+# 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 /W3 /Gm /GX /ZI /Od /I "../.." /I "../../g7221/common" /I "../../g7221/common/stl-files" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:"..\..\lib\libg7221-i386-win32-vc6-debug.lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "libg7221 - Win32 Release"

+# Name "libg7221 - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Group "common"

+

+# PROP Default_Filter ""

+# Begin Group "stl-files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE="..\..\g7221\common\stl-files\basop32.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\..\g7221\common\stl-files\basop32.h"

+# End Source File

+# Begin Source File

+

+SOURCE="..\..\g7221\common\stl-files\count.c"

+# End Source File

+# Begin Source File

+

+SOURCE="..\..\g7221\common\stl-files\count.h"

+# End Source File

+# Begin Source File

+

+SOURCE="..\..\g7221\common\stl-files\typedef.h"

+# End Source File

+# End Group

+# Begin Source File

+

+SOURCE=..\..\g7221\common\common.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\common\huff_def.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\common\huff_tab.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\common\huff_tab.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\common\tables.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\common\tables.h

+# End Source File

+# End Group

+# Begin Group "decode"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\..\g7221\decode\coef2sam.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\decode\dct4_s.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\decode\dct4_s.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\decode\decoder.c

+# End Source File

+# End Group

+# Begin Group "encode"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=..\..\g7221\encode\dct4_a.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\encode\dct4_a.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\encode\encoder.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\g7221\encode\sam2coef.c

+# End Source File

+# End Group

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=..\..\g7221\common\defs.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/third_party/build/g7221/libg7221.vcproj b/third_party/build/g7221/libg7221.vcproj
new file mode 100644
index 00000000..9ab08934
--- /dev/null
+++ b/third_party/build/g7221/libg7221.vcproj
@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="libg7221"

+	ProjectGUID="{2A3F241E-682C-47E1-9543-DC28708B406A}"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\output\libg7221-i386-win32-vc6-release"

+			IntermediateDirectory=".\output\libg7221-i386-win32-vc6-release"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				StringPooling="true"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="true"

+				PrecompiledHeaderFile=".\output\libg7221-i386-win32-vc6-release/libg7221.pch"

+				AssemblerListingLocation=".\output\libg7221-i386-win32-vc6-release/"

+				ObjectFile=".\output\libg7221-i386-win32-vc6-release/"

+				ProgramDataBaseFileName=".\output\libg7221-i386-win32-vc6-release/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\lib\libg7221-i386-win32-vc6-release.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\libg7221-i386-win32-vc6-release/libg7221.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\output\libg7221-i386-win32-vc6-debug"

+			IntermediateDirectory=".\output\libg7221-i386-win32-vc6-debug"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files"

+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				MinimalRebuild="true"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				PrecompiledHeaderFile=".\output\libg7221-i386-win32-vc6-debug/libg7221.pch"

+				AssemblerListingLocation=".\output\libg7221-i386-win32-vc6-debug/"

+				ObjectFile=".\output\libg7221-i386-win32-vc6-debug/"

+				ProgramDataBaseFileName=".\output\libg7221-i386-win32-vc6-debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+				OutputFile="..\..\lib\libg7221-i386-win32-vc6-debug.lib"

+				SuppressStartupBanner="true"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+				SuppressStartupBanner="true"

+				OutputFile=".\output\libg7221-i386-win32-vc6-debug/libg7221.bsc"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+			>

+			<Filter

+				Name="common"

+				>

+				<File

+					RelativePath="..\..\g7221\common\common.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\..\g7221\common\huff_def.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\g7221\common\huff_tab.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\..\g7221\common\huff_tab.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\g7221\common\tables.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\..\g7221\common\tables.h"

+					>

+				</File>

+				<Filter

+					Name="stl-files"

+					>

+					<File

+						RelativePath="..\..\g7221\common\stl-files\basop32.c"

+						>

+						<FileConfiguration

+							Name="Release|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+						<FileConfiguration

+							Name="Debug|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+					</File>

+					<File

+						RelativePath="..\..\g7221\common\stl-files\basop32.h"

+						>

+					</File>

+					<File

+						RelativePath="..\..\g7221\common\stl-files\count.c"

+						>

+						<FileConfiguration

+							Name="Release|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+						<FileConfiguration

+							Name="Debug|Win32"

+							>

+							<Tool

+								Name="VCCLCompilerTool"

+								AdditionalIncludeDirectories=""

+								PreprocessorDefinitions=""

+							/>

+						</FileConfiguration>

+					</File>

+					<File

+						RelativePath="..\..\g7221\common\stl-files\count.h"

+						>

+					</File>

+					<File

+						RelativePath="..\..\g7221\common\stl-files\typedef.h"

+						>

+					</File>

+				</Filter>

+			</Filter>

+			<Filter

+				Name="decode"

+				>

+				<File

+					RelativePath="..\..\g7221\decode\coef2sam.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\..\g7221\decode\dct4_s.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\..\g7221\decode\dct4_s.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\g7221\decode\decoder.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+			</Filter>

+			<Filter

+				Name="encode"

+				>

+				<File

+					RelativePath="..\..\g7221\encode\dct4_a.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\..\g7221\encode\dct4_a.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\g7221\encode\encoder.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+				<File

+					RelativePath="..\..\g7221\encode\sam2coef.c"

+					>

+					<FileConfiguration

+						Name="Release|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+					<FileConfiguration

+						Name="Debug|Win32"

+						>

+						<Tool

+							Name="VCCLCompilerTool"

+							AdditionalIncludeDirectories=""

+							PreprocessorDefinitions=""

+						/>

+					</FileConfiguration>

+				</File>

+			</Filter>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl"

+			>

+			<File

+				RelativePath="..\..\g7221\common\defs.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>