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/sine.h | |
| parent | a3998949d9c65076d91e3165733a5abd381ad882 (diff) | |
| parent | 5efae492bb690e8e92fe18fb0abe0aff345c3935 (diff) | |
Merge branch 'merge-codec2-update'
Diffstat (limited to 'gr-vocoder/lib/codec2/sine.h')
| -rw-r--r-- | gr-vocoder/lib/codec2/sine.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gr-vocoder/lib/codec2/sine.h b/gr-vocoder/lib/codec2/sine.h index f223e2afca..3a3ce46d62 100644 --- a/gr-vocoder/lib/codec2/sine.h +++ b/gr-vocoder/lib/codec2/sine.h @@ -30,15 +30,19 @@ #include "defines.h" #include "comp.h" +#include "kiss_fft.h" -void make_analysis_window(float w[], COMP W[]); +void make_analysis_window(kiss_fft_cfg fft_fwd_cfg, float w[], COMP W[]); float hpf(float x, float states[]); -void dft_speech(COMP Sw[], float Sn[], float w[]); +void dft_speech(kiss_fft_cfg fft_fwd_cfg, COMP Sw[], float Sn[], float w[]); void two_stage_pitch_refinement(MODEL *model, COMP Sw[]); -void estimate_amplitudes(MODEL *model, COMP Sw[], COMP W[]); +void estimate_amplitudes(MODEL *model, COMP Sw[], COMP W[], int est_phase); float est_voicing_mbe(MODEL *model, COMP Sw[], COMP W[], COMP Sw_[],COMP Ew[], float prev_Wo); void make_synthesis_window(float Pn[]); -void synthesise(float Sn_[], MODEL *model, float Pn[], int shift); +void synthesise(kiss_fft_cfg fft_inv_cfg, float Sn_[], MODEL *model, float Pn[], int shift); + +#define CODEC2_RAND_MAX 32767 +int codec2_rand(void); #endif |