зеркало из https://github.com/mozilla/gecko-dev.git
160 строки
4.6 KiB
Diff
160 строки
4.6 KiB
Diff
diff -u /src/cpu_detect_x86.cpp /src/cpu_detect_x86.cpp
|
|
--- /src/cpu_detect_x86.cpp
|
|
+++ /src/cpu_detect_x86.cpp
|
|
@@ -44,9 +44,8 @@
|
|
|
|
|
|
#if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
|
|
-
|
|
- #if defined(__GNUC__) && defined(__i386__)
|
|
- // gcc
|
|
+ #if defined(__GNUC__) && defined(HAVE_CPUID_H)
|
|
+ // gcc and clang
|
|
#include "cpuid.h"
|
|
#elif defined(_M_IX86)
|
|
// windows non-gcc
|
|
@@ -97,18 +96,7 @@
|
|
|
|
uint res = 0;
|
|
|
|
-#if defined(__GNUC__)
|
|
- // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
|
|
- uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
|
|
-
|
|
- // Check if no cpuid support.
|
|
- if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx)) return 0; // always disable extensions.
|
|
-
|
|
- if (edx & bit_MMX) res = res | SUPPORT_MMX;
|
|
- if (edx & bit_SSE) res = res | SUPPORT_SSE;
|
|
- if (edx & bit_SSE2) res = res | SUPPORT_SSE2;
|
|
-
|
|
-#else
|
|
+#if !defined(__GNUC__)
|
|
// Window / VS version of cpuid. Notice that Visual Studio 2005 or later required
|
|
// for __cpuid intrinsic support.
|
|
int reg[4] = {-1};
|
|
@@ -121,7 +109,19 @@
|
|
if ((unsigned int)reg[3] & bit_MMX) res = res | SUPPORT_MMX;
|
|
if ((unsigned int)reg[3] & bit_SSE) res = res | SUPPORT_SSE;
|
|
if ((unsigned int)reg[3] & bit_SSE2) res = res | SUPPORT_SSE2;
|
|
+#elif defined(HAVE_CPUID_H)
|
|
+ // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
|
|
+ uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
|
|
+
|
|
+ // Check if no cpuid support.
|
|
+ if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx)) return 0; // always disable extensions.
|
|
|
|
+ if (edx & bit_MMX) res = res | SUPPORT_MMX;
|
|
+ if (edx & bit_SSE) res = res | SUPPORT_SSE;
|
|
+ if (edx & bit_SSE2) res = res | SUPPORT_SSE2;
|
|
+#else
|
|
+ // Compatible with GCC but no cpuid.h.
|
|
+ return 0;
|
|
#endif
|
|
|
|
return res & ~_dwDisabledISA;
|
|
diff -u /src/STTypes.h /src/STTypes.h
|
|
--- /src/STTypes.h
|
|
+++ /src/STTypes.h
|
|
@@ -54,12 +54,17 @@
|
|
#define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
|
|
|
|
|
|
-#if (defined(__GNUC__) && !defined(ANDROID))
|
|
- // In GCC, include soundtouch_config.h made by config scritps.
|
|
- // Skip this in Android compilation that uses GCC but without configure scripts.
|
|
- #include "soundtouch_config.h"
|
|
-#endif
|
|
+#include "soundtouch_config.h"
|
|
|
|
+#if defined(WIN32) && defined(GKMEDIAS_SHARED_LIBRARY)
|
|
+#ifdef BUILDING_SOUNDTOUCH
|
|
+#define EXPORT __declspec(dllexport)
|
|
+#else
|
|
+#define EXPORT __declspec(dllimport)
|
|
+#endif
|
|
+#else
|
|
+#define EXPORT
|
|
+#endif
|
|
|
|
namespace soundtouch
|
|
{
|
|
@@ -164,7 +169,7 @@
|
|
};
|
|
|
|
// define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions:
|
|
-// #define ST_NO_EXCEPTION_HANDLING 1
|
|
+#define ST_NO_EXCEPTION_HANDLING 1
|
|
#ifdef ST_NO_EXCEPTION_HANDLING
|
|
// Exceptions disabled. Throw asserts instead if enabled.
|
|
#include <assert.h>
|
|
diff -u /src/SoundTouch.h /src/SoundTouch.h
|
|
--- /src/SoundTouch.h
|
|
+++ /src/SoundTouch.h
|
|
@@ -141,7 +141,7 @@
|
|
/// tempo/pitch/rate/samplerate settings.
|
|
#define SETTING_NOMINAL_OUTPUT_SEQUENCE 7
|
|
|
|
-class SoundTouch : public FIFOProcessor
|
|
+class EXPORT SoundTouch : public FIFOProcessor
|
|
{
|
|
private:
|
|
/// Rate transposer class instance
|
|
diff -u /src/FIRFilter.cpp /src/FIRFilter.cpp
|
|
--- /src/FIRFilter.cpp
|
|
+++ /src/FIRFilter.cpp
|
|
@@ -46,6 +46,11 @@
|
|
#include "FIRFilter.h"
|
|
#include "cpu_detect.h"
|
|
|
|
+#ifdef _MSC_VER
|
|
+#include <malloc.h>
|
|
+#define alloca _alloca
|
|
+#endif
|
|
+
|
|
using namespace soundtouch;
|
|
|
|
/*****************************************************************************
|
|
@@ -291,9 +296,11 @@
|
|
|
|
FIRFilter * FIRFilter::newInstance()
|
|
{
|
|
+#if defined(SOUNDTOUCH_ALLOW_MMX) || defined(SOUNDTOUCH_ALLOW_SSE)
|
|
uint uExtensions;
|
|
|
|
uExtensions = detectCPUextensions();
|
|
+#endif
|
|
|
|
// Check if MMX/SSE instruction set extensions supported by CPU
|
|
|
|
diff -u /src/TDStretch.cpp /src/TDStretch.cpp
|
|
--- /src/TDStretch.cpp
|
|
+++ /src/TDStretch.cpp
|
|
@@ -624,9 +624,11 @@
|
|
|
|
TDStretch * TDStretch::newInstance()
|
|
{
|
|
+#if defined(SOUNDTOUCH_ALLOW_MMX) || defined(SOUNDTOUCH_ALLOW_SSE)
|
|
uint uExtensions;
|
|
|
|
uExtensions = detectCPUextensions();
|
|
+#endif
|
|
|
|
// Check if MMX/SSE instruction set extensions supported by CPU
|
|
|
|
diff -u /src/SoundTouch.cpp /src/SoundTouch.cpp
|
|
--- /src/SoundTouch.cpp
|
|
+++ /src/SoundTouch.cpp
|
|
@@ -80,6 +80,11 @@
|
|
#include "RateTransposer.h"
|
|
#include "cpu_detect.h"
|
|
|
|
+#ifdef _MSC_VER
|
|
+#include <malloc.h>
|
|
+#define alloca _alloca
|
|
+#endif
|
|
+
|
|
using namespace soundtouch;
|
|
|
|
/// test if two floating point numbers are equal
|