diff options
author | Marcus Asteborg <maastebo@microsoft.com> | 2020-06-06 09:07:46 +0300 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2020-06-12 04:25:06 +0300 |
commit | 09f8f05bce8914f6df3a0d7d6feca256ca5f12dd (patch) | |
tree | 7d8db05d87db3e2ac740dfa5463bf114bfd72181 | |
parent | fe00017a06ddf9314ce79a83a60ae6333769bb24 (diff) |
Build time improvement, for MSVC use intrin0.h instead of intrin.h and remove usage of stdio.h in production code
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
-rw-r--r-- | celt/ecintrin.h | 4 | ||||
-rw-r--r-- | celt/os_support.h | 1 | ||||
-rw-r--r-- | silk/MacroCount.h | 2 | ||||
-rw-r--r-- | silk/debug.c | 3 | ||||
-rw-r--r-- | silk/debug.h | 25 | ||||
-rw-r--r-- | src/analysis.c | 2 |
6 files changed, 23 insertions, 14 deletions
diff --git a/celt/ecintrin.h b/celt/ecintrin.h index 2263cff6..0b4ca71e 100644 --- a/celt/ecintrin.h +++ b/celt/ecintrin.h @@ -49,7 +49,11 @@ This macro should only be used for implementing ec_ilog(), if it is defined. All other code should use EC_ILOG() instead.*/ #if defined(_MSC_VER) && (_MSC_VER >= 1400) +#if defined(_MSC_VER) && (_MSC_VER >= 1900) +# include <intrin0.h> /* Improve compiler throughput. */ +#else # include <intrin.h> +#endif /*In _DEBUG mode this is not an intrinsic by default.*/ # pragma intrinsic(_BitScanReverse) diff --git a/celt/os_support.h b/celt/os_support.h index a2171971..009bf861 100644 --- a/celt/os_support.h +++ b/celt/os_support.h @@ -39,7 +39,6 @@ #include "opus_defines.h" #include <string.h> -#include <stdio.h> #include <stdlib.h> /** Opus wrapper for malloc(). To do your own dynamic allocation, all you need to do is replace this function and opus_free */ diff --git a/silk/MacroCount.h b/silk/MacroCount.h index 78100ffe..dab2f57a 100644 --- a/silk/MacroCount.h +++ b/silk/MacroCount.h @@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SIGPROCFIX_API_MACROCOUNT_H #define SIGPROCFIX_API_MACROCOUNT_H -#include <stdio.h> #ifdef silk_MACRO_COUNT +#include <stdio.h> #define varDefine opus_int64 ops_count = 0; extern opus_int64 ops_count; diff --git a/silk/debug.c b/silk/debug.c index 9253faf7..71e69cc6 100644 --- a/silk/debug.c +++ b/silk/debug.c @@ -30,7 +30,10 @@ POSSIBILITY OF SUCH DAMAGE. #endif #include "debug.h" + +#if SILK_DEBUG || SILK_TIC_TOC #include "SigProc_FIX.h" +#endif #if SILK_TIC_TOC diff --git a/silk/debug.h b/silk/debug.h index 6f68c1ca..36163e47 100644 --- a/silk/debug.h +++ b/silk/debug.h @@ -28,28 +28,29 @@ POSSIBILITY OF SUCH DAMAGE. #ifndef SILK_DEBUG_H #define SILK_DEBUG_H -#include "typedef.h" -#include <stdio.h> /* file writing */ -#include <string.h> /* strcpy, strcmp */ - -#ifdef __cplusplus -extern "C" -{ -#endif - -unsigned long GetHighResolutionTime(void); /* O time in usec*/ - /* Set to 1 to enable DEBUG_STORE_DATA() macros for dumping * intermediate signals from the codec. */ #define SILK_DEBUG 0 /* Flag for using timers */ -#define SILK_TIC_TOC 0 +#define SILK_TIC_TOC 0 +#if SILK_DEBUG || SILK_TIC_TOC +#include "typedef.h" +#include <string.h> /* strcpy, strcmp */ +#include <stdio.h> /* file writing */ +#endif + +#ifdef __cplusplus +extern "C" +{ +#endif #if SILK_TIC_TOC +unsigned long GetHighResolutionTime(void); /* O time in usec*/ + #if (defined(_WIN32) || defined(_WINCE)) #include <windows.h> /* timer */ #else /* Linux or Mac*/ diff --git a/src/analysis.c b/src/analysis.c index cb46dec5..058328f0 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -31,7 +31,9 @@ #define ANALYSIS_C +#ifdef MLP_TRAINING #include <stdio.h> +#endif #include "mathops.h" #include "kiss_fft.h" |