diff options
author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2024-03-22 17:30:13 -0400 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2024-03-22 17:30:13 -0400 |
commit | 0ff478b1fc91c039b41eb8e0f4326ab217baf57c (patch) | |
tree | 2f05fb7f2278a20ba6b8fd99b597b0a8a52434a1 /src | |
parent | 51dc185175325aefe823c59d2d38e525535374dd (diff) | |
download | rnnoise-0ff478b1fc91c039b41eb8e0f4326ab217baf57c.tar.gz |
rename kiss-fft symbols
Diffstat (limited to 'src')
-rw-r--r-- | src/denoise.c | 6 | ||||
-rw-r--r-- | src/kiss_fft.c | 28 | ||||
-rw-r--r-- | src/kiss_fft.h | 34 |
3 files changed, 34 insertions, 34 deletions
diff --git a/src/denoise.c b/src/denoise.c index 213c042..7d2cb25 100644 --- a/src/denoise.c +++ b/src/denoise.c @@ -168,7 +168,7 @@ CommonState common; static void check_init() { int i; if (common.init) return; - common.kfft = opus_fft_alloc_twiddles(2*FRAME_SIZE, NULL, NULL, NULL, 0); + common.kfft = rnn_fft_alloc_twiddles(2*FRAME_SIZE, NULL, NULL, NULL, 0); for (i=0;i<FRAME_SIZE;i++) common.half_window[i] = sin(.5*M_PI*sin(.5*M_PI*(i+.5)/FRAME_SIZE) * sin(.5*M_PI*(i+.5)/FRAME_SIZE)); for (i=0;i<NB_BANDS;i++) { @@ -218,7 +218,7 @@ static void forward_transform(kiss_fft_cpx *out, const float *in) { x[i].r = in[i]; x[i].i = 0; } - opus_fft(common.kfft, x, y, 0); + rnn_fft(common.kfft, x, y, 0); for (i=0;i<FREQ_SIZE;i++) { out[i] = y[i]; } @@ -236,7 +236,7 @@ static void inverse_transform(float *out, const kiss_fft_cpx *in) { x[i].r = x[WINDOW_SIZE - i].r; x[i].i = -x[WINDOW_SIZE - i].i; } - opus_fft(common.kfft, x, y, 0); + rnn_fft(common.kfft, x, y, 0); /* output in reverse order for IFFT. */ out[0] = WINDOW_SIZE*y[0].r; for (i=1;i<WINDOW_SIZE;i++) { diff --git a/src/kiss_fft.c b/src/kiss_fft.c index d6b9f26..02cafdb 100644 --- a/src/kiss_fft.c +++ b/src/kiss_fft.c @@ -420,7 +420,7 @@ static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft) #endif } -int opus_fft_alloc_arch_c(kiss_fft_state *st) { +int rnn_fft_alloc_arch_c(kiss_fft_state *st) { (void)st; return 0; } @@ -431,7 +431,7 @@ int opus_fft_alloc_arch_c(kiss_fft_state *st) { * The return value is a contiguous block of memory. As such, * It can be freed with free(). * */ -kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, +kiss_fft_state *rnn_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, const kiss_fft_state *base, int arch) { kiss_fft_state *st=NULL; @@ -483,29 +483,29 @@ kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, compute_bitrev_table(0, bitrev, 1,1, st->factors,st); /* Initialize architecture specific fft parameters */ - if (opus_fft_alloc_arch(st, arch)) + if (rnn_fft_alloc_arch(st, arch)) goto fail; } return st; fail: - opus_fft_free(st, arch); + rnn_fft_free(st, arch); return NULL; } -kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch) +kiss_fft_state *rnn_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch) { - return opus_fft_alloc_twiddles(nfft, mem, lenmem, NULL, arch); + return rnn_fft_alloc_twiddles(nfft, mem, lenmem, NULL, arch); } -void opus_fft_free_arch_c(kiss_fft_state *st) { +void rnn_fft_free_arch_c(kiss_fft_state *st) { (void)st; } -void opus_fft_free(const kiss_fft_state *cfg, int arch) +void rnn_fft_free(const kiss_fft_state *cfg, int arch) { if (cfg) { - opus_fft_free_arch((kiss_fft_state *)cfg, arch); + rnn_fft_free_arch((kiss_fft_state *)cfg, arch); opus_free((opus_int16*)cfg->bitrev); if (cfg->shift < 0) opus_free((kiss_twiddle_cpx*)cfg->twiddles); @@ -515,7 +515,7 @@ void opus_fft_free(const kiss_fft_state *cfg, int arch) #endif /* CUSTOM_MODES */ -void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout) +void rnn_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout) { int m2, m; int p; @@ -563,7 +563,7 @@ void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout) } } -void opus_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) +void rnn_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) { int i; opus_val16 scale; @@ -582,11 +582,11 @@ void opus_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *f fout[st->bitrev[i]].r = SHR32(MULT16_32_Q16(scale, x.r), scale_shift); fout[st->bitrev[i]].i = SHR32(MULT16_32_Q16(scale, x.i), scale_shift); } - opus_fft_impl(st, fout); + rnn_fft_impl(st, fout); } -void opus_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) +void rnn_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) { int i; celt_assert2 (fin != fout, "In-place FFT not supported"); @@ -595,7 +595,7 @@ void opus_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx * fout[st->bitrev[i]] = fin[i]; for (i=0;i<st->nfft;i++) fout[i].i = -fout[i].i; - opus_fft_impl(st, fout); + rnn_fft_impl(st, fout); for (i=0;i<st->nfft;i++) fout[i].i = -fout[i].i; } diff --git a/src/kiss_fft.h b/src/kiss_fft.h index b2fe9a4..c9bc006 100644 --- a/src/kiss_fft.h +++ b/src/kiss_fft.h @@ -128,9 +128,9 @@ typedef struct kiss_fft_state{ * buffer size in *lenmem. * */ -kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, const kiss_fft_state *base, int arch); +kiss_fft_state *rnn_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, const kiss_fft_state *base, int arch); -kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch); +kiss_fft_state *rnn_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch); /** * opus_fft(cfg,in_out_buf) @@ -142,17 +142,17 @@ kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch); * Note that each element is complex and can be accessed like f[k].r and f[k].i * */ -void opus_fft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); -void opus_ifft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); +void rnn_fft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); +void rnn_ifft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); -void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout); -void opus_ifft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout); +void rnn_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout); +void rnn_ifft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout); -void opus_fft_free(const kiss_fft_state *cfg, int arch); +void rnn_fft_free(const kiss_fft_state *cfg, int arch); -void opus_fft_free_arch_c(kiss_fft_state *st); -int opus_fft_alloc_arch_c(kiss_fft_state *st); +void rnn_fft_free_arch_c(kiss_fft_state *st); +int rnn_fft_alloc_arch_c(kiss_fft_state *st); #if !defined(OVERRIDE_OPUS_FFT) /* Is run-time CPU detection enabled on this platform? */ @@ -181,17 +181,17 @@ extern void (*const OPUS_IFFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg, #else /* else for if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */ -#define opus_fft_alloc_arch(_st, arch) \ - ((void)(arch), opus_fft_alloc_arch_c(_st)) +#define rnn_fft_alloc_arch(_st, arch) \ + ((void)(arch), rnn_fft_alloc_arch_c(_st)) -#define opus_fft_free_arch(_st, arch) \ - ((void)(arch), opus_fft_free_arch_c(_st)) +#define rnn_fft_free_arch(_st, arch) \ + ((void)(arch), rnn_fft_free_arch_c(_st)) -#define opus_fft(_cfg, _fin, _fout, arch) \ - ((void)(arch), opus_fft_c(_cfg, _fin, _fout)) +#define rnn_fft(_cfg, _fin, _fout, arch) \ + ((void)(arch), rnn_fft_c(_cfg, _fin, _fout)) -#define opus_ifft(_cfg, _fin, _fout, arch) \ - ((void)(arch), opus_ifft_c(_cfg, _fin, _fout)) +#define rnn_ifft(_cfg, _fin, _fout, arch) \ + ((void)(arch), rnn_ifft_c(_cfg, _fin, _fout)) #endif /* end if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */ #endif /* end if !defined(OVERRIDE_OPUS_FFT) */ |