diff options
Diffstat (limited to 'celt/pitch.h')
| -rw-r--r-- | celt/pitch.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/celt/pitch.h b/celt/pitch.h index 027ebd9b..5c6e551a 100644 --- a/celt/pitch.h +++ b/celt/pitch.h @@ -62,7 +62,6 @@ opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod, /* OPT: This is the kernel you really want to optimize. It gets used a lot by the prefilter and by the PLC. */ -#ifndef OVERRIDE_XCORR_KERNEL static OPUS_INLINE void xcorr_kernel_c(const opus_val16 * x, const opus_val16 * y, opus_val32 sum[4], int len) { int j; @@ -129,11 +128,9 @@ static OPUS_INLINE void xcorr_kernel_c(const opus_val16 * x, const opus_val16 * } } -#if !defined(OPUS_X86_MAY_HAVE_SSE4_1) +#ifndef OVERRIDE_XCORR_KERNEL #define xcorr_kernel(x, y, sum, len, arch) \ ((void)(arch),xcorr_kernel_c(x, y, sum, len)) -#endif - #endif /* OVERRIDE_XCORR_KERNEL */ @@ -177,7 +174,7 @@ opus_val32 void #endif celt_pitch_xcorr_c(const opus_val16 *_x, const opus_val16 *_y, - opus_val32 *xcorr, int len, int max_pitch, int arch); + opus_val32 *xcorr, int len, int max_pitch); #if !defined(OVERRIDE_PITCH_XCORR) /*Is run-time CPU detection enabled on this platform?*/ @@ -191,12 +188,20 @@ void (*const CELT_PITCH_XCORR_IMPL[OPUS_ARCHMASK+1])(const opus_val16 *, const opus_val16 *, opus_val32 *, int, int); +# define OVERRIDE_PITCH_XCORR # define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \ ((*CELT_PITCH_XCORR_IMPL[(arch)&OPUS_ARCHMASK])(_x, _y, \ xcorr, len, max_pitch)) # else -# define celt_pitch_xcorr(_x, _y, xcorr, len, max_pitch, arch) \ - ((void)(arch),celt_pitch_xcorr_c(_x, _y, xcorr, len, max_pitch, arch)) + +#ifdef FIXED_POINT +opus_val32 +#else +void +#endif +celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y, + opus_val32 *xcorr, int len, int max_pitch, int arch); + # endif #endif |