some integration

diff --git a/src/denoise.c b/src/denoise.c
index 8a27335..026a839 100644 (file)
--- a/src/denoise.c
+++ b/src/denoise.c
@@ -5,6 +5,8 @@
 #include "common.h"
 #include <math.h>
 #include "pitch.h"
+#include "rnn.h"
+#include "rnn_data.h"
 
 #define FRAME_SIZE_SHIFT 2
 #define FRAME_SIZE (120<<FRAME_SIZE_SHIFT)
@@ -53,6 +55,7 @@ typedef struct {
   float pitch_enh_buf[PITCH_BUF_SIZE];
   float last_gain;
   int last_period;
+  RNNState rnn;
 } DenoiseState;
 
 #if SMOOTH_BANDS
@@ -427,6 +430,7 @@ int main(int argc, char **argv) {
     float gf[FREQ_SIZE]={1};
     short tmp[FRAME_SIZE];
     float vad=0;
+    float vad_prob;
     float E=0;
     if (++gain_change_count > 101*300) {
       speech_gain = pow(10., (-30+(rand()%40))/20.);
@@ -478,12 +482,13 @@ int main(int argc, char **argv) {
     for (i=0;i<NB_BANDS;i++) printf("%f ", Ln[i]);
     printf("%f\n", vad);
 #endif
-#if 1
+#if 0
     fwrite(features, sizeof(float), NB_FEATURES, stdout);
     fwrite(g, sizeof(float), NB_BANDS, stdout);
     fwrite(Ln, sizeof(float), NB_BANDS, stdout);
     fwrite(&vad, sizeof(float), 1, stdout);
 #endif
+    compute_rnn(&noisy->rnn, g, &vad_prob, features);
     //for (i=0;i<NB_BANDS;i++) scanf("%f", &g[i]);
     interp_band_gain(gf, g);
 #if 1

diff --git a/src/rnn.c b/src/rnn.c
index b6b83e2..70db8ac 100644 (file)
--- a/src/rnn.c
+++ b/src/rnn.c
@@ -155,7 +155,6 @@ void compute_gru(const GRULayer *gru, float *state, const float *input)
       state[i] = h[i];
 }
 
-#if 1
 #define INPUT_SIZE 42
 
 void compute_rnn(RNNState *rnn, float *gains, float *vad, const float *input) {
@@ -178,6 +177,7 @@ void compute_rnn(RNNState *rnn, float *gains, float *vad, const float *input) {
   compute_dense(&denoise_output, gains, rnn->denoise_gru_state);
 }
 
+#if 0
 int main() {
   float vad_out[MAX_NEURONS] = {0};
   float input[INPUT_SIZE];