diff --git a/audio/audio_filters/fft/fft.h b/audio/audio_filters/fft/fft.h index 4952e8e04a..64df4cc042 100644 --- a/audio/audio_filters/fft/fft.h +++ b/audio/audio_filters/fft/fft.h @@ -17,61 +17,10 @@ #define RARCH_FFT_H__ #include +#include typedef struct fft fft_t; -// C99 would be nice. -typedef struct -{ - float real; - float imag; -} fft_complex_t; - -static INLINE fft_complex_t fft_complex_mul(fft_complex_t a, - fft_complex_t b) -{ - fft_complex_t out = { - a.real * b.real - a.imag * b.imag, - a.imag * b.real + a.real * b.imag, - }; - - return out; - -} - -static INLINE fft_complex_t fft_complex_add(fft_complex_t a, - fft_complex_t b) -{ - fft_complex_t out = { - a.real + b.real, - a.imag + b.imag, - }; - - return out; - -} - -static INLINE fft_complex_t fft_complex_sub(fft_complex_t a, - fft_complex_t b) -{ - fft_complex_t out = { - a.real - b.real, - a.imag - b.imag, - }; - - return out; - -} - -static INLINE fft_complex_t fft_complex_conj(fft_complex_t a) -{ - fft_complex_t out = { - a.real, -a.imag, - }; - - return out; -} - fft_t *fft_new(unsigned block_size_log2); void fft_free(fft_t *fft); diff --git a/libretro-common/include/math/complex.h b/libretro-common/include/math/complex.h new file mode 100644 index 0000000000..3b26d1c8e0 --- /dev/null +++ b/libretro-common/include/math/complex.h @@ -0,0 +1,80 @@ +/* Copyright (C) 2010-2016 The RetroArch team + * + * --------------------------------------------------------------------------------------- + * The following license statement only applies to this file (fxp.h). + * --------------------------------------------------------------------------------------- + * + * Permission is hereby granted, free of charge, + * to any person obtaining a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +#ifndef __LIBRETRO_SDK_MATH_COMPLEX_H__ +#define __LIBRETRO_SDK_MATH_COMPLEX_H__ + +#include + +#include + +typedef struct +{ + float real; + float imag; +} fft_complex_t; + +static INLINE fft_complex_t fft_complex_mul(fft_complex_t a, + fft_complex_t b) +{ + fft_complex_t out = { + a.real * b.real - a.imag * b.imag, + a.imag * b.real + a.real * b.imag, + }; + + return out; + +} + +static INLINE fft_complex_t fft_complex_add(fft_complex_t a, + fft_complex_t b) +{ + fft_complex_t out = { + a.real + b.real, + a.imag + b.imag, + }; + + return out; + +} + +static INLINE fft_complex_t fft_complex_sub(fft_complex_t a, + fft_complex_t b) +{ + fft_complex_t out = { + a.real - b.real, + a.imag - b.imag, + }; + + return out; + +} + +static INLINE fft_complex_t fft_complex_conj(fft_complex_t a) +{ + fft_complex_t out = { + a.real, -a.imag, + }; + + return out; +} + +#endif