diff --git a/.gitignore b/.gitignore index 770bb8aa..cb9a104a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,10 @@ libtool speexdsp.pc stamp-* patches +m4 +win32/VS20*/Win32 +Win32/VS20*/tests/Debug +win32/VS20*/libspeexdsp/Debug +win32/VS20*/*.open* +*.bak +win32/testfile diff --git a/doc/manual.pdf b/doc/manual.pdf index 292f304d..88a01583 100644 Binary files a/doc/manual.pdf and b/doc/manual.pdf differ diff --git a/libspeexdsp/mdf.c b/libspeexdsp/mdf.c index 7b367f9a..30b64f72 100644 --- a/libspeexdsp/mdf.c +++ b/libspeexdsp/mdf.c @@ -431,7 +431,7 @@ EXPORT SpeexEchoState *speex_echo_state_init_mc(int frame_size, int filter_lengt st->beta_max = DIV32_16(SHL32(EXTEND32(st->frame_size), 14), st->sampling_rate); #else st->beta0 = (2.0f*st->frame_size)/st->sampling_rate; - st->beta_max = (.5f*st->frame_size)/st->sampling_rate; + st->beta_max = (0.5f*st->frame_size)/st->sampling_rate; #endif st->leak_estimate = 0; @@ -470,12 +470,15 @@ EXPORT SpeexEchoState *speex_echo_state_init_mc(int frame_size, int filter_lengt } #else for (i=0;iwindow[i] = .5-.5*cos(2*M_PI*i/N); + st->window[i] = 0.5-0.5*cos(2*M_PI*i/N); #endif + for (i=0;i<=st->frame_size;i++) st->power_1[i] = FLOAT_ONE; + for (i=0;iW[i] = 0; + { spx_word32_t sum = 0; /* Ratio of ~10 between adaptation rate of first and last block */ @@ -496,13 +499,14 @@ EXPORT SpeexEchoState *speex_echo_state_init_mc(int frame_size, int filter_lengt st->memX = (spx_word16_t*)speex_alloc(K*sizeof(spx_word16_t)); st->memD = (spx_word16_t*)speex_alloc(C*sizeof(spx_word16_t)); st->memE = (spx_word16_t*)speex_alloc(C*sizeof(spx_word16_t)); - st->preemph = QCONST16(.9,15); + st->preemph = QCONST16(0.9,15); + if (st->sampling_rate<12000) - st->notch_radius = QCONST16(.9, 15); + st->notch_radius = QCONST16(0.9, 15); else if (st->sampling_rate<24000) - st->notch_radius = QCONST16(.982, 15); + st->notch_radius = QCONST16(0.982, 15); else - st->notch_radius = QCONST16(.992, 15); + st->notch_radius = QCONST16(0.992, 15); st->notch_mem = (spx_mem_t*)speex_alloc(2*C*sizeof(spx_mem_t)); st->adapted = 0; @@ -1029,6 +1033,7 @@ EXPORT void speex_echo_cancellation(SpeexEchoState *st, const spx_int16_t *in, c /* Everything's fine */ st->screwed_up=0; } + if (st->screwed_up>=50) { speex_warning("The echo canceller started acting funny and got slapped (reset). It swears it will behave now."); @@ -1239,11 +1244,11 @@ EXPORT int speex_echo_ctl(SpeexEchoState *st, int request, void *ptr) st->beta_max = (.5f*st->frame_size)/st->sampling_rate; #endif if (st->sampling_rate<12000) - st->notch_radius = QCONST16(.9, 15); + st->notch_radius = QCONST16(0.9, 15); else if (st->sampling_rate<24000) - st->notch_radius = QCONST16(.982, 15); + st->notch_radius = QCONST16(0.982, 15); else - st->notch_radius = QCONST16(.992, 15); + st->notch_radius = QCONST16(0.992, 15); break; case SPEEX_ECHO_GET_SAMPLING_RATE: (*(int*)ptr) = st->sampling_rate; diff --git a/libspeexdsp/testdenoise.c b/libspeexdsp/testdenoise.c index adebe941..624c4fd9 100644 --- a/libspeexdsp/testdenoise.c +++ b/libspeexdsp/testdenoise.c @@ -5,9 +5,9 @@ #include "speex/speex_preprocess.h" #include -#define NN 160 +#define NN 160*6 -int main() +int main(int argc, char *argv[]) { short in[NN]; int i; @@ -15,7 +15,10 @@ int main() int count=0; float f; - st = speex_preprocess_state_init(NN, 8000); + freopen(argv[1], "rb", stdin); + freopen(argv[2], "wb", stdout); + + st = speex_preprocess_state_init(NN, 8000*6); i=1; speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i); i=0; @@ -28,17 +31,20 @@ int main() speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB_DECAY, &f); f=.0; speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB_LEVEL, &f); + while (1) { int vad; fread(in, sizeof(short), NN, stdin); if (feof(stdin)) break; + vad = speex_preprocess_run(st, in); /*fprintf (stderr, "%d\n", vad);*/ fwrite(in, sizeof(short), NN, stdout); count++; } + speex_preprocess_state_destroy(st); return 0; } diff --git a/libspeexdsp/testecho.c b/libspeexdsp/testecho.c index 1624dc2a..ae869b85 100644 --- a/libspeexdsp/testecho.c +++ b/libspeexdsp/testecho.c @@ -11,28 +11,27 @@ #include -#define NN 128 -#define TAIL 1024 +#define NN (128*6) +#define TAIL (1024*4) int main(int argc, char **argv) { - FILE *echo_fd, *ref_fd, *e_fd; short echo_buf[NN], ref_buf[NN], e_buf[NN]; - SpeexEchoState *st; - SpeexPreprocessState *den; - int sampleRate = 8000; + const int sampleRate = 8000*6; if (argc != 4) { fprintf(stderr, "testecho mic_signal.sw speaker_signal.sw output.sw\n"); exit(1); } - echo_fd = fopen(argv[2], "rb"); - ref_fd = fopen(argv[1], "rb"); - e_fd = fopen(argv[3], "wb"); - st = speex_echo_state_init(NN, TAIL); - den = speex_preprocess_state_init(NN, sampleRate); + FILE *echo_fd = fopen(argv[2], "rb");//FAR-end file(to speaker) + FILE *ref_fd = fopen(argv[1], "rb");//mic capture file + FILE *e_fd = fopen(argv[3], "wb");//output file + + SpeexEchoState *st = speex_echo_state_init(NN, TAIL); + SpeexPreprocessState *den = speex_preprocess_state_init(NN, sampleRate); + speex_echo_ctl(st, SPEEX_ECHO_SET_SAMPLING_RATE, &sampleRate); speex_preprocess_ctl(den, SPEEX_PREPROCESS_SET_ECHO_STATE, st); @@ -40,14 +39,18 @@ int main(int argc, char **argv) { fread(ref_buf, sizeof(short), NN, ref_fd); fread(echo_buf, sizeof(short), NN, echo_fd); + speex_echo_cancellation(st, ref_buf, echo_buf, e_buf); speex_preprocess_run(den, e_buf); + fwrite(e_buf, sizeof(short), NN, e_fd); } + speex_echo_state_destroy(st); speex_preprocess_state_destroy(den); fclose(e_fd); fclose(echo_fd); fclose(ref_fd); + return 0; } diff --git a/libspeexdsp/testresample.c b/libspeexdsp/testresample.c index 7ed86675..121706b9 100644 --- a/libspeexdsp/testresample.c +++ b/libspeexdsp/testresample.c @@ -44,18 +44,17 @@ int main() { spx_uint32_t i; - short *in; - short *out; - float *fin, *fout; - int count = 0; + SpeexResamplerState *st = speex_resampler_init(1, 8000, 12000, 10, NULL); speex_resampler_set_rate(st, 96000, 44100); speex_resampler_skip_zeros(st); - in = malloc(NN*sizeof(short)); - out = malloc(2*NN*sizeof(short)); - fin = malloc(NN*sizeof(float)); - fout = malloc(2*NN*sizeof(float)); + float *in = malloc(NN*sizeof(short)); + float *out = malloc(2*NN*sizeof(short)); + float *fin = malloc(NN*sizeof(float)); + float *fout = malloc(2*NN*sizeof(float)); + int count = 0; + while (1) { spx_uint32_t in_len; @@ -63,19 +62,26 @@ int main() fread(in, sizeof(short), NN, stdin); if (feof(stdin)) break; + for (i=0;i + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj b/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj new file mode 100755 index 00000000..02ec57c5 --- /dev/null +++ b/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj @@ -0,0 +1,226 @@ + + + + + Debug + Win32 + + + Release_Dynamic_SSE + Win32 + + + Release_Static_SSE + Win32 + + + Release + Win32 + + + + {03207781-0D1C-4DB3-A71D-45C608F28DBD} + Win32Proj + 8.1 + + + + StaticLibrary + v140 + MultiByte + true + + + DynamicLibrary + v140 + MultiByte + true + + + StaticLibrary + v140 + MultiByte + true + + + StaticLibrary + v140 + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + Debug\ + $(SolutionDir)$(Platform)\$(Configuration)\ + + + $(Configuration)\ + $(Configuration)\ + + + $(Configuration)\ + $(Configuration)\ + + + $(Configuration)\ + $(Configuration)\ + + + + Disabled + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + CompileAsC + + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + + Level3 + ProgramDatabase + CompileAsC + 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + _USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + StreamingSIMDExtensions + + Level3 + ProgramDatabase + CompileAsC + 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + + + ../../../bin/libspeexdsp.dll + ..\..\libspeexdsp.def + Windows + true + true + false + + ../../../lib/libspeexdsp.lib + MachineX86 + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + _USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + StreamingSIMDExtensions + + Level3 + ProgramDatabase + CompileAsC + 4244;4305;4311;4100;4127;%(DisableSpecificWarnings) + + + ../../../lib/libspeexdsp.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj.filters b/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj.filters new file mode 100755 index 00000000..f20eb31c --- /dev/null +++ b/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj.filters @@ -0,0 +1,143 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {85e6ee64-bd64-47d9-bd10-fecffaf00499} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj.user b/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj.user new file mode 100755 index 00000000..0dd0cf24 --- /dev/null +++ b/win32/VS2015/libspeexdsp/libspeexdsp.vcxproj.user @@ -0,0 +1,7 @@ + + + + $(OutDir) + WindowsLocalDebugger + + \ No newline at end of file diff --git a/win32/VS2015/tests/Makefile.am b/win32/VS2015/tests/Makefile.am new file mode 100755 index 00000000..7fe63e62 --- /dev/null +++ b/win32/VS2015/tests/Makefile.am @@ -0,0 +1,8 @@ +## Process this file with automake to produce Makefile.in. -*-Makefile-*- + +# Disable automatic dependency tracking if using other tools than gcc and gmake +#AUTOMAKE_OPTIONS = no-dependencies + +EXTRA_DIST = testdenoise.vcproj testecho.vcproj testresample.vcproj + + diff --git a/win32/VS2015/tests/testdenoise.vcproj b/win32/VS2015/tests/testdenoise.vcproj new file mode 100755 index 00000000..1c0f8c15 --- /dev/null +++ b/win32/VS2015/tests/testdenoise.vcproj @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/VS2015/tests/testdenoise.vcxproj b/win32/VS2015/tests/testdenoise.vcxproj new file mode 100755 index 00000000..92e6b72f --- /dev/null +++ b/win32/VS2015/tests/testdenoise.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Release_SSE + Win32 + + + Release + Win32 + + + + {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9} + Win32Proj + 8.1 + + + + Application + v140 + MultiByte + true + + + Application + v140 + MultiByte + true + + + Application + v140 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + Debug\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + + + Release\ + Release\ + false + + + $(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + true + Console + false + + MachineX86 + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + + Level3 + ProgramDatabase + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + ../../../bin/testdenoise.exe + true + Console + true + true + false + + MachineX86 + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + StreamingSIMDExtensions + + Level3 + ProgramDatabase + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + ../../../bin/testdenoise.exe + true + Console + true + true + false + + MachineX86 + + + + + {03207781-0d1c-4db3-a71d-45c608f28dbd} + false + + + + + + + + + \ No newline at end of file diff --git a/win32/VS2015/tests/testdenoise.vcxproj.filters b/win32/VS2015/tests/testdenoise.vcxproj.filters new file mode 100755 index 00000000..b0d748d6 --- /dev/null +++ b/win32/VS2015/tests/testdenoise.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/VS2015/tests/testdenoise.vcxproj.user b/win32/VS2015/tests/testdenoise.vcxproj.user new file mode 100755 index 00000000..2082d25b --- /dev/null +++ b/win32/VS2015/tests/testdenoise.vcxproj.user @@ -0,0 +1,8 @@ + + + + $(SolutionDir)\..\..\testfile + WindowsLocalDebugger + test-denoise/noise.pcm test-denoise/out.pcm + + \ No newline at end of file diff --git a/win32/VS2015/tests/testecho.vcproj b/win32/VS2015/tests/testecho.vcproj new file mode 100755 index 00000000..c2c41268 --- /dev/null +++ b/win32/VS2015/tests/testecho.vcproj @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/VS2015/tests/testecho.vcxproj b/win32/VS2015/tests/testecho.vcxproj new file mode 100755 index 00000000..537a3329 --- /dev/null +++ b/win32/VS2015/tests/testecho.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Release_SSE + Win32 + + + Release + Win32 + + + + {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA} + Win32Proj + 8.1 + + + + Application + v140 + MultiByte + true + + + Application + v140 + MultiByte + true + + + Application + v140 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + Debug\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + + + Release\ + Release\ + false + + + $(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + true + Console + false + + MachineX86 + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + + Level3 + ProgramDatabase + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + true + Console + true + true + false + + MachineX86 + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + StreamingSIMDExtensions + + Level3 + ProgramDatabase + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + ../../../bin/testecho.exe + true + Console + true + true + false + + MachineX86 + + + + + {03207781-0d1c-4db3-a71d-45c608f28dbd} + false + + + + + + + + + \ No newline at end of file diff --git a/win32/VS2015/tests/testecho.vcxproj.filters b/win32/VS2015/tests/testecho.vcxproj.filters new file mode 100755 index 00000000..6f44ee1e --- /dev/null +++ b/win32/VS2015/tests/testecho.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/VS2015/tests/testecho.vcxproj.user b/win32/VS2015/tests/testecho.vcxproj.user new file mode 100755 index 00000000..c7f0b97f --- /dev/null +++ b/win32/VS2015/tests/testecho.vcxproj.user @@ -0,0 +1,8 @@ + + + + WindowsLocalDebugger + $(SolutionDir)\..\..\testfile + micin.pcm speaker.pcm out3.pcm + + \ No newline at end of file diff --git a/win32/VS2015/tests/testresample.vcproj b/win32/VS2015/tests/testresample.vcproj new file mode 100755 index 00000000..45565ed8 --- /dev/null +++ b/win32/VS2015/tests/testresample.vcproj @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32/VS2015/tests/testresample.vcxproj b/win32/VS2015/tests/testresample.vcxproj new file mode 100755 index 00000000..6717a9e0 --- /dev/null +++ b/win32/VS2015/tests/testresample.vcxproj @@ -0,0 +1,167 @@ + + + + + Debug + Win32 + + + Release_SSE + Win32 + + + Release + Win32 + + + + {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB} + Win32Proj + 8.1 + + + + Application + v140 + MultiByte + true + + + Application + v140 + MultiByte + true + + + Application + v140 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + Debug\ + true + $(SolutionDir)$(Platform)\$(Configuration)\ + + + Release\ + Release\ + false + + + $(Configuration)\ + $(Configuration)\ + false + + + + Disabled + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + true + Console + false + + MachineX86 + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + + Level3 + ProgramDatabase + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + ../../../bin/testresample.exe + true + Console + true + true + false + + MachineX86 + + + + + Full + AnySuitable + true + Speed + ..\..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + MultiThreadedDLL + false + StreamingSIMDExtensions + + Level3 + ProgramDatabase + CompileAsC + + + winmm.lib;%(AdditionalDependencies) + ../../../bin/testresample.exe + true + Console + true + true + false + + MachineX86 + + + + + {03207781-0d1c-4db3-a71d-45c608f28dbd} + false + + + + + + + + + \ No newline at end of file diff --git a/win32/VS2015/tests/testresample.vcxproj.filters b/win32/VS2015/tests/testresample.vcxproj.filters new file mode 100755 index 00000000..92e50dab --- /dev/null +++ b/win32/VS2015/tests/testresample.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/VS2015/tests/testresample.vcxproj.user b/win32/VS2015/tests/testresample.vcxproj.user new file mode 100755 index 00000000..a388d256 --- /dev/null +++ b/win32/VS2015/tests/testresample.vcxproj.user @@ -0,0 +1,7 @@ + + + + $(DirDir) + WindowsLocalDebugger + + \ No newline at end of file