diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-04-21 09:41:31 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-04-21 09:41:31 -0700 |
| commit | 33e5aeb722ba4fc1c2ae3162c4940b546037717f (patch) | |
| tree | c3f1e57feeab5ea07e0bc5d7d56791c881f457b7 /gr-vocoder/lib/codec2/interp.h | |
| parent | a3998949d9c65076d91e3165733a5abd381ad882 (diff) | |
| parent | 5efae492bb690e8e92fe18fb0abe0aff345c3935 (diff) | |
Merge branch 'merge-codec2-update'
Diffstat (limited to 'gr-vocoder/lib/codec2/interp.h')
| -rw-r--r-- | gr-vocoder/lib/codec2/interp.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gr-vocoder/lib/codec2/interp.h b/gr-vocoder/lib/codec2/interp.h index d509726140..24cb9462a3 100644 --- a/gr-vocoder/lib/codec2/interp.h +++ b/gr-vocoder/lib/codec2/interp.h @@ -28,14 +28,18 @@ #ifndef __INTERP__ #define __INTERP__ -#define RES_POINTS 20 +#include "kiss_fft.h" void interpolate(MODEL *interp, MODEL *prev, MODEL *next); -void interpolate_lsp(MODEL *interp, MODEL *prev, MODEL *next, +void interpolate_lsp(kiss_fft_cfg fft_dec_cfg, + MODEL *interp, MODEL *prev, MODEL *next, float *prev_lsps, float prev_e, float *next_lsps, float next_e, - float *ak_interp); -float resample_amp(MODEL *model, int m); -float resample_amp_nl(MODEL *model, int m, float Ares_prev[]); + float *ak_interp, float *lsps_interp); +void interp_Wo(MODEL *interp, MODEL *prev, MODEL *next); +void interp_Wo2(MODEL *interp, MODEL *prev, MODEL *next, float weight); +float interp_energy(float prev, float next); +float interp_energy2(float prev, float next, float weight); +void interpolate_lsp_ver2(float interp[], float prev[], float next[], float weight); #endif |