shithub: opus

Download patch

ref: ca4a8d4f09e80761c02f8ee4efe8f9350de68e41
parent: 242198ea66a7f1939c7073a57f4931a5f102d4ce
author: Jean-Marc Valin <jmvalin@jmvalin.ca>
date: Tue Dec 11 11:53:22 EST 2018 

More cleanup


--- a/dnn/dump_data.c
+++ b/dnn/dump_data.c
@@ -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,18 +63,18 @@
   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);
@@ -81,11 +81,11 @@
   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 @@
     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;
 }
 
--- a/dnn/freq.h
+++ b/dnn/freq.h
@@ -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);
 
-- 
⑨