mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update resampler drivers to be in sync with Mupen64 - don't

Browse Source 
use logging functions here
This commit is contained in:
twinaphex 2015-02-05 19:40:46 +01:00
parent 4ffbadd49c
commit e75e6ed1be
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/drivers_resampler/cc_resampler.c
View File

@ -23,14 +23,6 @@
#include <xmmintrin.h> #include <xmmintrin.h>
#endif #endif
#if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL)
#include "../../general.h"
#else
/* FIXME - variadic macros not supported for MSVC 2003 */
#define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__)
#endif
/* Since SSE and NEON don't provide support for trigonometric functions /* Since SSE and NEON don't provide support for trigonometric functions
* we approximate those with polynoms * we approximate those with polynoms
* *
@ -208,7 +200,6 @@ static void *resampler_CC_init(const struct resampler_config *config,
".set pop\n"); ".set pop\n");
RARCH_LOG("\nConvoluted Cosine resampler (VFPU): \n");
return (void*)-1; return (void*)-1;
} }
#else #else
@ -572,19 +563,15 @@ static void *resampler_CC_init(const struct resampler_config *config,
re->buffer[i].r = 0.0; re->buffer[i].r = 0.0;
} }
RARCH_LOG("Convoluted Cosine resampler (" CC_RESAMPLER_IDENT ") - precision = %i : ", CC_RESAMPLER_PRECISION);
/* Variations of data->ratio around 0.75 are safer /* Variations of data->ratio around 0.75 are safer
* than around 1.0 for both up/downsampler. */ * than around 1.0 for both up/downsampler. */
if (bandwidth_mod < 0.75) if (bandwidth_mod < 0.75)
{ {
RARCH_LOG("CC_downsample @%f \n", bandwidth_mod);
re->process = resampler_CC_downsample; re->process = resampler_CC_downsample;
re->distance = 0.0; re->distance = 0.0;
} }
else else
{ {
RARCH_LOG("CC_upsample @%f \n", bandwidth_mod);
re->process = resampler_CC_upsample; re->process = resampler_CC_upsample;
re->distance = 2.0; re->distance = 2.0;
} }

9
audio/drivers_resampler/nearest.c
View File

@ -19,13 +19,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL)
#include "../../general.h"
#else
/* FIXME - variadic macros not supported for MSVC 2003 */
#define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__)
#endif
typedef struct rarch_nearest_resampler typedef struct rarch_nearest_resampler
{ {
float fraction; float fraction;
@ -75,8 +68,6 @@ static void *resampler_nearest_init(const struct resampler_config *config,
re->fraction = 0; re->fraction = 0;
RARCH_LOG("\nNearest resampler : \n");
return re; return re;
} }

18
audio/drivers_resampler/sinc.c
View File

@ -22,12 +22,6 @@
#include <string.h> #include <string.h>
#include <compat/posix_string.h> #include <compat/posix_string.h>
#if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL)
#include "../../general.h"
#else
#define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__)
#endif
#ifdef __SSE__ #ifdef __SSE__
#include <xmmintrin.h> #include <xmmintrin.h>
#endif #endif
@ -528,21 +522,11 @@ static void *resampler_sinc_new(const struct resampler_config *config,
init_sinc_table(re, cutoff, re->phase_table, init_sinc_table(re, cutoff, re->phase_table,
1 << PHASE_BITS, re->taps, SINC_COEFF_LERP); 1 << PHASE_BITS, re->taps, SINC_COEFF_LERP);
#if defined(__AVX__) && ENABLE_AVX #if defined(__ARM_NEON__)
RARCH_LOG("Sinc resampler [AVX]\n");
#elif defined(__SSE__)
RARCH_LOG("Sinc resampler [SSE]\n");
#elif defined(__ARM_NEON__)
process_sinc_func = mask & RESAMPLER_SIMD_NEON process_sinc_func = mask & RESAMPLER_SIMD_NEON
? process_sinc_neon : process_sinc_C; ? process_sinc_neon : process_sinc_C;
RARCH_LOG("Sinc resampler [%s]\n",
mask & RESAMPLER_SIMD_NEON ? "NEON" : "C");
#else
RARCH_LOG("Sinc resampler [C]\n");
#endif #endif
RARCH_LOG("SINC params (%u phase bits, %u taps).\n",
PHASE_BITS, re->taps);
return re; return re;
error: error: