Reviving model loading based on Opus code

Author: jmvalin

Makefile.am

@@ -54,18 +54,22 @@ librnnoise_la_LIBADD = $(DEPS_LIBS) $(lrintf_lib) $(LIBM)
 librnnoise_la_LDFLAGS = -no-undefined \
  -version-info @OP_LT_CURRENT@:@OP_LT_REVISION@:@OP_LT_AGE@
 
-noinst_PROGRAMS = dump_features
+noinst_PROGRAMS = dump_features dump_weights_blob
 if OP_ENABLE_EXAMPLES
 noinst_PROGRAMS += examples/rnnoise_demo
 endif
 
 examples_rnnoise_demo_SOURCES = examples/rnnoise_demo.c
 examples_rnnoise_demo_LDADD = librnnoise.la
 
-dump_features_SOURCES = src/dump_features.c src/denoise.c src/pitch.c src/celt_lpc.c src/kiss_fft.c src/rnnoise_data.c src/parse_lpcnet_weights.c src/rnnoise_tables.c
+dump_features_SOURCES = src/dump_features.c src/denoise.c src/pitch.c src/celt_lpc.c src/kiss_fft.c src/parse_lpcnet_weights.c src/rnnoise_tables.c
 dump_features_LDADD = $(LIBM)
 dump_features_CFLAGS = $(AM_CFLAGS) -DTRAINING
 
+dump_weights_blob_SOURCES = src/write_weights.c
+dump_weights_blob_LDADD = $(LIBM)
+dump_weights_blob_CFLAGS = $(AM_CFLAGS) -DDUMP_BINARY_WEIGHTS
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = rnnoise.pc
 

examples/rnnoise_demo.c

@@ -36,7 +36,14 @@ int main(int argc, char **argv) {
   float x[FRAME_SIZE];
   FILE *f1, *fout;
   DenoiseState *st;
+#ifdef USE_WEIGHTS_FILE
+  FILE *model_file = fopen("weights_blob.bin", "r");
+  RNNModel *model = rnnoise_model_from_file(model_file);
+  st = rnnoise_create(model);
+#else
   st = rnnoise_create(NULL);
+#endif
+
   if (argc!=3) {
     fprintf(stderr, "usage: %s <noisy speech> <output denoised>\n", argv[0]);
     return 1;
@@ -56,5 +63,9 @@ int main(int argc, char **argv) {
   rnnoise_destroy(st);
   fclose(f1);
   fclose(fout);
+#ifdef USE_WEIGHTS_FILE
+  fclose(model_file);
+  rnnoise_model_free(model);
+#endif
   return 0;
 }

src/denoise.c

@@ -50,9 +50,6 @@
 #endif
 
 
-/* The built-in model, used if no file is given as input */
-extern const struct RNNModel rnnoise_model_orig;
-
 /* ERB bandwidths going in reverse from 20 kHz and then replacing the 700 and 800
    with just 750 because having 32 bands is convenient for the DNN. 
    B(1)=400;
@@ -226,6 +223,33 @@ static void apply_window(float *x) {
   }
 }
 
+struct RNNModel {
+  unsigned char *blob;
+  int blob_len;
+};
+
+RNNModel *rnnoise_model_from_file(FILE *f) {
+  RNNModel *model;
+  model = malloc(sizeof(*model));
+
+  fseek(f, 0, SEEK_END);
+  model->blob_len = ftell(f);
+  fseek(f, 0, SEEK_SET);
+
+  model->blob = malloc(model->blob_len);
+  if (fread(model->blob, model->blob_len, 1, f) != 1)
+  {
+    rnnoise_model_free(model);
+    return NULL;
+  }
+  return model;
+}
+
+void rnnoise_model_free(RNNModel *model) {
+  free(model->blob);
+  free(model);
+}
+
 int rnnoise_get_size() {
   return sizeof(DenoiseState);
 }
@@ -234,21 +258,41 @@ int rnnoise_get_frame_size() {
   return FRAME_SIZE;
 }
 
-extern const WeightArray rnnoise_arrays[];
 int rnnoise_init(DenoiseState *st, RNNModel *model) {
   memset(st, 0, sizeof(*st));
-  init_rnnoise(&st->model, rnnoise_arrays);
 #if !TRAINING
-  st->arch = rnn_select_arch();
+  if (model != NULL) {
+    WeightArray *list;
+    int ret = 1;
+    parse_weights(&list, model->blob, model->blob_len);
+    if (list != NULL) {
+      ret = init_rnnoise(&st->model, list);
+      opus_free(list);
+    }
+    if (ret != 0) return -1;
+  }
+#ifndef USE_WEIGHTS_FILE
+  else {
+    int ret = init_rnnoise(&st->model, rnnoise_arrays);
+    if (ret != 0) return -1;
+  }
 #endif
+  st->arch = rnn_select_arch();
+#else
   (void)model;
+#endif
   return 0;
 }
 
 DenoiseState *rnnoise_create(RNNModel *model) {
+  int ret;
   DenoiseState *st;
   st = malloc(rnnoise_get_size());
-  rnnoise_init(st, model);
+  ret = rnnoise_init(st, model);
+  if (ret != 0) {
+    free(st);
+    return NULL;
+  }
   return st;
 }
 

src/denoise.h

@@ -26,7 +26,7 @@
 
 #include "rnnoise.h"
 #include "kiss_fft.h"
-
+#include "nnet.h"
 
 #define FRAME_SIZE 480
 #define WINDOW_SIZE (2*FRAME_SIZE)
@@ -40,6 +40,7 @@
 #define PITCH_FRAME_SIZE 960
 #define PITCH_BUF_SIZE (PITCH_MAX_PERIOD+PITCH_FRAME_SIZE)
 
+extern const WeightArray rnnoise_arrays[];
 
 extern const int eband20ms[];