mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(sinc_resampler.c) Cut down on ifdef party

Browse Source
This commit is contained in:
twinaphex 2017-06-07 03:09:23 +02:00
parent 34b5d0025b
commit b610d034ae
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libretro-common/audio/resampler/drivers/sinc_resampler.c
View File

@ -96,6 +96,12 @@
#define ENABLE_AVX 0 #define ENABLE_AVX 0
#endif #endif
#if SINC_COEFF_LERP
#define TAPS_MULT 2
#else
#define TAPS_MULT 1
#endif
#if defined(SINC_WINDOW_LANCZOS) #if defined(SINC_WINDOW_LANCZOS)
#define window_function(idx) (lanzcos_window_function(idx)) #define window_function(idx) (lanzcos_window_function(idx))
#elif defined(SINC_WINDOW_KAISER) #elif defined(SINC_WINDOW_KAISER)
@ -225,19 +231,15 @@ static void resampler_sinc_process_avx(void *re_, struct resampler_data *data)
const float *buffer_r = resamp->buffer_r + resamp->ptr; const float *buffer_r = resamp->buffer_r + resamp->ptr;
unsigned taps = resamp->taps; unsigned taps = resamp->taps;
unsigned phase = resamp->time >> SUBPHASE_BITS; unsigned phase = resamp->time >> SUBPHASE_BITS;
const float *phase_table = resamp->phase_table + phase * taps * TAPS_MULT;
#if SINC_COEFF_LERP #if SINC_COEFF_LERP
const float *phase_table = resamp->phase_table + phase * taps * 2;
const float *delta_table = phase_table + taps; const float *delta_table = phase_table + taps;
#else __m256 delta = _mm256_set1_ps((float)
const float *phase_table = resamp->phase_table + phase * taps; (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD);
#endif #endif
__m256 sum_l = _mm256_setzero_ps(); __m256 sum_l = _mm256_setzero_ps();
__m256 sum_r = _mm256_setzero_ps(); __m256 sum_r = _mm256_setzero_ps();
#if SINC_COEFF_LERP
__m256 delta = _mm256_set1_ps((float)
(resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD);
#endif
for (i = 0; i < taps; i += 8) for (i = 0; i < taps; i += 8)
{ {
@ -312,25 +314,21 @@ static void resampler_sinc_process_sse(void *re_, struct resampler_data *data)
while (resamp->time < PHASES) while (resamp->time < PHASES)
{ {
unsigned i; unsigned i;
__m128 sum;
const float *buffer_l = resamp->buffer_l + resamp->ptr; const float *buffer_l = resamp->buffer_l + resamp->ptr;
const float *buffer_r = resamp->buffer_r + resamp->ptr; const float *buffer_r = resamp->buffer_r + resamp->ptr;
unsigned taps = resamp->taps; unsigned taps = resamp->taps;
unsigned phase = resamp->time >> SUBPHASE_BITS; unsigned phase = resamp->time >> SUBPHASE_BITS;
const float *phase_table = resamp->phase_table + phase * taps * TAPS_MULT;
#if SINC_COEFF_LERP #if SINC_COEFF_LERP
const float *phase_table = resamp->phase_table + phase * taps * 2;
const float *delta_table = phase_table + taps; const float *delta_table = phase_table + taps;
#else
const float *phase_table = resamp->phase_table + phase * taps;
#endif
__m128 sum;
__m128 sum_l = _mm_setzero_ps();
__m128 sum_r = _mm_setzero_ps();
#if SINC_COEFF_LERP
__m128 delta = _mm_set1_ps((float) __m128 delta = _mm_set1_ps((float)
(resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD); (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD);
#endif #endif
__m128 sum_l = _mm_setzero_ps();
__m128 sum_r = _mm_setzero_ps();
for (i = 0; i < taps; i += 4) for (i = 0; i < taps; i += 4)
{ {
__m128 buf_l = _mm_loadu_ps(buffer_l + i); __m128 buf_l = _mm_loadu_ps(buffer_l + i);
@ -418,18 +416,14 @@ static void resampler_sinc_process_c(void *re_, struct resampler_data *data)
const float *buffer_r = resamp->buffer_r + resamp->ptr; const float *buffer_r = resamp->buffer_r + resamp->ptr;
unsigned taps = resamp->taps; unsigned taps = resamp->taps;
unsigned phase = resamp->time >> SUBPHASE_BITS; unsigned phase = resamp->time >> SUBPHASE_BITS;
const float *phase_table = resamp->phase_table + phase * taps * TAPS_MULT;
#if SINC_COEFF_LERP #if SINC_COEFF_LERP
const float *phase_table = resamp->phase_table + phase * taps * 2;
const float *delta_table = phase_table + taps; const float *delta_table = phase_table + taps;
#else
const float *phase_table = resamp->phase_table + phase * taps;
#endif
float sum_l = 0.0f;
float sum_r = 0.0f;
#if SINC_COEFF_LERP
float delta = (float) float delta = (float)
(resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD; (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD;
#endif #endif
float sum_l = 0.0f;
float sum_r = 0.0f;
for (i = 0; i < taps; i++) for (i = 0; i < taps; i++)
{ {
@ -551,10 +545,7 @@ static void *resampler_sinc_new(const struct resampler_config *config,
re->taps = (re->taps + 3) & ~3; re->taps = (re->taps + 3) & ~3;
#endif #endif
phase_elems = (1 << PHASE_BITS) * re->taps; phase_elems = ((1 << PHASE_BITS) * re->taps) * TAPS_MULT;
#if SINC_COEFF_LERP
phase_elems *= 2;
#endif
elems = phase_elems + 4 * re->taps; elems = phase_elems + 4 * re->taps;
re->main_buffer = (float*)memalign_alloc(128, sizeof(float) * elems); re->main_buffer = (float*)memalign_alloc(128, sizeof(float) * elems);