diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-04-07 16:01:41 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-04-07 16:01:41 +0000 |
commit | 0c4b2974931a0f030c81647c65058fd22108495b (patch) | |
tree | 5461e272d2f4cdf39935d7277c56b654dd848f32 /third_party/build | |
parent | ca07a9833149d270d1e5b44cfa381ac6ac03e39c (diff) |
Changed resample to use speex (for now)
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1171 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party/build')
-rw-r--r-- | third_party/build/resample/config.h | 18 | ||||
-rw-r--r-- | third_party/build/resample/endian.h | 1 | ||||
-rw-r--r-- | third_party/build/resample/libresample.dsp | 94 | ||||
-rw-r--r-- | third_party/build/resample/resamplesubs.h | 23 | ||||
-rw-r--r-- | third_party/build/speex/libspeex.dsp | 2 |
5 files changed, 1 insertions, 137 deletions
diff --git a/third_party/build/resample/config.h b/third_party/build/resample/config.h deleted file mode 100644 index bf4cda6a..00000000 --- a/third_party/build/resample/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* This file is included by endian.h */ - -#include <pj/types.h> -#undef INLINE -#define INLINE __inline - - -#ifndef WITH_PJ -# error This needs to be declared! -#endif - -#ifdef _MSC_VER -# pragma warning(disable: 4244) // conversion from 'double ' to 'unsigned int ', possible loss of data -# pragma warning(disable: 4761) // integral size mismatch in argument; conversion supplied -#endif - -#define STATIC - diff --git a/third_party/build/resample/endian.h b/third_party/build/resample/endian.h deleted file mode 100644 index 1ac2545d..00000000 --- a/third_party/build/resample/endian.h +++ /dev/null @@ -1 +0,0 @@ -#include "config.h" diff --git a/third_party/build/resample/libresample.dsp b/third_party/build/resample/libresample.dsp deleted file mode 100644 index 3bd4ca14..00000000 --- a/third_party/build/resample/libresample.dsp +++ /dev/null @@ -1,94 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libresample" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libresample - 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 "libresample.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 "libresample.mak" CFG="libresample - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libresample - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libresample - 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)" == "libresample - 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\libresample-i386-vc6-release" -# PROP Intermediate_Dir "output\libresample-i386-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 /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\libresample-i386-vc6-release.lib" - -!ELSEIF "$(CFG)" == "libresample - 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\libresample-i386-vc6-debug" -# PROP Intermediate_Dir "output\libresample-i386-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 /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\libresample-i386-vc6-debug.lib" - -!ENDIF - -# Begin Target - -# Name "libresample - Win32 Release" -# Name "libresample - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# End Target -# End Project diff --git a/third_party/build/resample/resamplesubs.h b/third_party/build/resample/resamplesubs.h deleted file mode 100644 index 825df971..00000000 --- a/third_party/build/resample/resamplesubs.h +++ /dev/null @@ -1,23 +0,0 @@ - -int - SrcLinear(short X[], short Y[], double factor, unsigned int *Time, unsigned short Nx); - -int SrcUp(short X[], short Y[], double factor, unsigned int *Time, - unsigned short Nx, unsigned short Nwing, unsigned short LpScl, - short Imp[], short ImpD[], char Interp); - -int SrcUD(short X[], short Y[], double factor, unsigned int *Time, - unsigned short Nx, unsigned short Nwing, unsigned short LpScl, - short Imp[], short ImpD[], char Interp); - -extern unsigned resample_LARGE_FILTER_NMULT; -extern unsigned resample_LARGE_FILTER_NWING; -extern unsigned resample_LARGE_FILTER_SCALE; -extern short* resample_LARGE_FILTER_IMP; -extern short* resample_LARGE_FILTER_IMPD; - -extern unsigned resample_SMALL_FILTER_NMULT; -extern unsigned resample_SMALL_FILTER_NWING; -extern unsigned resample_SMALL_FILTER_SCALE; -extern short* resample_SMALL_FILTER_IMP; -extern short* resample_SMALL_FILTER_IMPD; diff --git a/third_party/build/speex/libspeex.dsp b/third_party/build/speex/libspeex.dsp index 518169e0..b36818f3 100644 --- a/third_party/build/speex/libspeex.dsp +++ b/third_party/build/speex/libspeex.dsp @@ -66,7 +66,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 "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /Ox /Ot /Og /Oi /Ob2 /I "." /I "../../speex/include" /I "../../../pjlib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /GX /ZI /Od /Ob0 /I "." /I "../../speex/include" /I "../../../pjlib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "HAVE_CONFIG_H" /YX /FD /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
|