FreeDV
/
LPCNet
mirror of https://github.com/drowe67/LPCNet.git
1
0
Fork 0
Code Issues Releases Wiki Activity

More cleanup

pull/8/head
Jean-Marc Valin 2018-12-11 16:53:22 -05:00
parent 7c7cd2d478
commit 0f81f22044
No known key found for this signature in database
GPG Key ID: 5E5DD9A36F9189C8
2 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dump_data.c
View File

@ -52,7 +52,7 @@
#define NB_FEATURES (2*NB_BANDS+3+LPC_ORDER)
struct DenoiseState {
typedef struct {
float analysis_mem[FRAME_SIZE];
float cepstral_mem[CEPS_MEM][NB_BANDS];
int memid;
@ -63,29 +63,29 @@ struct DenoiseState {
int last_period;
float mem_hp_x[2];
float lastg[NB_BANDS];
};
} DenoiseState;
int rnnoise_get_size() {
static int rnnoise_get_size() {
return sizeof(DenoiseState);
}
int rnnoise_init(DenoiseState *st) {
static int rnnoise_init(DenoiseState *st) {
memset(st, 0, sizeof(*st));
return 0;
}
DenoiseState *rnnoise_create() {
static DenoiseState *rnnoise_create() {
DenoiseState *st;
st = malloc(rnnoise_get_size());
rnnoise_init(st);
return st;
}
void rnnoise_destroy(DenoiseState *st) {
static void rnnoise_destroy(DenoiseState *st) {
free(st);
}
short float2short(float x)
static short float2short(float x)
{
int i;
i = (int)floor(.5+x);
@ -314,10 +314,10 @@ int main(int argc, char **argv) {
old_speech_gain = speech_gain;
count++;
}
//fprintf(stderr, "matrix size: %d x %d\n", count, NB_FEATURES + 2*NB_BANDS + 1);
fclose(f1);
fclose(ffeat);
if (fpcm) fclose(fpcm);
rnnoise_destroy(st);
return 0;
}

28
src/freq.h
View File

@ -33,34 +33,6 @@
#define NB_BANDS 18
#ifndef RNNOISE_EXPORT
# if defined(WIN32)
# if defined(RNNOISE_BUILD) && defined(DLL_EXPORT)
# define RNNOISE_EXPORT __declspec(dllexport)
# else
# define RNNOISE_EXPORT
# endif
# elif defined(__GNUC__) && defined(RNNOISE_BUILD)
# define RNNOISE_EXPORT __attribute__ ((visibility ("default")))
# else
# define RNNOISE_EXPORT
# endif
#endif
typedef struct DenoiseState DenoiseState;
RNNOISE_EXPORT int rnnoise_get_size();
RNNOISE_EXPORT int rnnoise_init(DenoiseState *st);
RNNOISE_EXPORT DenoiseState *rnnoise_create();
RNNOISE_EXPORT void rnnoise_destroy(DenoiseState *st);
RNNOISE_EXPORT float rnnoise_process_frame(DenoiseState *st, float *out, const float *in);
void compute_band_energy(float *bandE, const kiss_fft_cpx *X);
void compute_band_corr(float *bandE, const kiss_fft_cpx *X, const kiss_fft_cpx *P);