mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 13:27:45 -07:00
Restore Dolphin-Specific SoundTouch modifications
This commit is contained in:
parent
4e3a366b2d
commit
0e7e8d26f0
5
Externals/soundtouch/BPMDetect.cpp
vendored
5
Externals/soundtouch/BPMDetect.cpp
vendored
@ -47,8 +47,6 @@
|
|||||||
//
|
//
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#define _USE_MATH_DEFINES
|
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -85,7 +83,8 @@ static const double XCORR_DECAY_TIME_CONSTANT = 30.0;
|
|||||||
/// Data overlap factor for beat detection algorithm
|
/// Data overlap factor for beat detection algorithm
|
||||||
static const int OVERLAP_FACTOR = 4;
|
static const int OVERLAP_FACTOR = 4;
|
||||||
|
|
||||||
static const double TWOPI = (2 * M_PI);
|
#define PI 3.14159265358979323846
|
||||||
|
#define TWOPI (2 * PI)
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
33
Externals/soundtouch/STTypes.h
vendored
33
Externals/soundtouch/STTypes.h
vendored
@ -32,6 +32,15 @@
|
|||||||
#ifndef STTypes_H
|
#ifndef STTypes_H
|
||||||
#define STTypes_H
|
#define STTypes_H
|
||||||
|
|
||||||
|
#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
|
||||||
|
|
||||||
|
|
||||||
|
namespace soundtouch
|
||||||
|
{
|
||||||
typedef unsigned int uint;
|
typedef unsigned int uint;
|
||||||
typedef unsigned long ulong;
|
typedef unsigned long ulong;
|
||||||
|
|
||||||
@ -46,23 +55,13 @@ typedef unsigned long ulong;
|
|||||||
// Helper macro for aligning pointer up to next 16-byte boundary
|
// Helper macro for aligning pointer up to next 16-byte boundary
|
||||||
#define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
|
#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
|
|
||||||
|
|
||||||
|
|
||||||
namespace soundtouch
|
|
||||||
{
|
|
||||||
/// Max allowed number of channels
|
/// Max allowed number of channels
|
||||||
#define SOUNDTOUCH_MAX_CHANNELS 16
|
#define SOUNDTOUCH_MAX_CHANNELS 16
|
||||||
|
|
||||||
/// Activate these undef's to overrule the possible sampletype
|
/// Activate these undef's to overrule the possible sampletype
|
||||||
/// setting inherited from some other header file:
|
/// setting inherited from some other header file:
|
||||||
//#undef SOUNDTOUCH_INTEGER_SAMPLES
|
#undef SOUNDTOUCH_INTEGER_SAMPLES
|
||||||
//#undef SOUNDTOUCH_FLOAT_SAMPLES
|
#undef SOUNDTOUCH_FLOAT_SAMPLES
|
||||||
|
|
||||||
/// If following flag is defined, always uses multichannel processing
|
/// If following flag is defined, always uses multichannel processing
|
||||||
/// routines also for mono and stero sound. This is for routine testing
|
/// routines also for mono and stero sound. This is for routine testing
|
||||||
@ -94,8 +93,8 @@ namespace soundtouch
|
|||||||
/// However, if you still prefer to select the sample format here
|
/// However, if you still prefer to select the sample format here
|
||||||
/// also in GNU environment, then please #undef the INTEGER_SAMPLE
|
/// also in GNU environment, then please #undef the INTEGER_SAMPLE
|
||||||
/// and FLOAT_SAMPLE defines first as in comments above.
|
/// and FLOAT_SAMPLE defines first as in comments above.
|
||||||
//#define SOUNDTOUCH_INTEGER_SAMPLES 1 //< 16bit integer samples
|
#define SOUNDTOUCH_INTEGER_SAMPLES 1 //< 16bit integer samples
|
||||||
#define SOUNDTOUCH_FLOAT_SAMPLES 1 //< 32bit float samples
|
//#define SOUNDTOUCH_FLOAT_SAMPLES 1 //< 32bit float samples
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -106,7 +105,7 @@ namespace soundtouch
|
|||||||
/// routines compiled for whatever reason, you may disable these optimizations
|
/// routines compiled for whatever reason, you may disable these optimizations
|
||||||
/// to make the library compile.
|
/// to make the library compile.
|
||||||
|
|
||||||
#define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS 1
|
//#define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS 1
|
||||||
|
|
||||||
/// In GNU environment, allow the user to override this setting by
|
/// In GNU environment, allow the user to override this setting by
|
||||||
/// giving the following switch to the configure script:
|
/// giving the following switch to the configure script:
|
||||||
@ -124,7 +123,7 @@ namespace soundtouch
|
|||||||
// If defined, allows the SIMD-optimized routines to skip unevenly aligned
|
// If defined, allows the SIMD-optimized routines to skip unevenly aligned
|
||||||
// memory offsets that can cause performance penalty in some SIMD implementations.
|
// memory offsets that can cause performance penalty in some SIMD implementations.
|
||||||
// Causes slight compromise in sound quality.
|
// Causes slight compromise in sound quality.
|
||||||
// #define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION 1
|
#define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION 1
|
||||||
|
|
||||||
|
|
||||||
#ifdef SOUNDTOUCH_INTEGER_SAMPLES
|
#ifdef SOUNDTOUCH_INTEGER_SAMPLES
|
||||||
@ -169,7 +168,7 @@ namespace soundtouch
|
|||||||
}
|
}
|
||||||
|
|
||||||
// define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions:
|
// 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
|
#ifdef ST_NO_EXCEPTION_HANDLING
|
||||||
// Exceptions disabled. Throw asserts instead if enabled.
|
// Exceptions disabled. Throw asserts instead if enabled.
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
2
Externals/soundtouch/cpu_detect.h
vendored
2
Externals/soundtouch/cpu_detect.h
vendored
@ -44,6 +44,8 @@
|
|||||||
#define SUPPORT_SSE 0x0008
|
#define SUPPORT_SSE 0x0008
|
||||||
#define SUPPORT_SSE2 0x0010
|
#define SUPPORT_SSE2 0x0010
|
||||||
|
|
||||||
|
using namespace soundtouch;
|
||||||
|
|
||||||
/// Checks which instruction set extensions are supported by the CPU.
|
/// Checks which instruction set extensions are supported by the CPU.
|
||||||
///
|
///
|
||||||
/// \return A bitmask of supported extensions, see SUPPORT_... defines.
|
/// \return A bitmask of supported extensions, see SUPPORT_... defines.
|
||||||
|
Loading…
Reference in New Issue
Block a user