Adding more ways to load model

Can now load from file name, or from a memory buffer (e.g. for mmap())

Author: jmvalin

examples/rnnoise_demo.c

@@ -37,8 +37,7 @@ int main(int argc, char **argv) {
   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);
+  RNNModel *model = rnnoise_model_from_filename("weights_blob.bin");
   st = rnnoise_create(model);
 #else
   st = rnnoise_create(NULL);
@@ -64,7 +63,6 @@ int main(int argc, char **argv) {
   fclose(f1);
   fclose(fout);
 #ifdef USE_WEIGHTS_FILE
-  fclose(model_file);
   rnnoise_model_free(model);
 #endif
   return 0;

include/rnnoise.h

@@ -93,13 +93,30 @@ RNNOISE_EXPORT void rnnoise_destroy(DenoiseState *st);
  */
 RNNOISE_EXPORT float rnnoise_process_frame(DenoiseState *st, float *out, const float *in);
 
+/**
+ * Load a model from a memory buffer
+ *
+ * It must be deallocated with rnnoise_model_free() and the buffer must remain
+ * valid until after the returned object is destroyed.
+ */
+RNNOISE_EXPORT RNNModel *rnnoise_model_from_buffer(const void *ptr, int len);
+
+
 /**
  * Load a model from a file
  *
- * It must be deallocated with rnnoise_model_free()
+ * It must be deallocated with rnnoise_model_free() and the file must not be
+ * closed until the returned object is destroyed.
  */
 RNNOISE_EXPORT RNNModel *rnnoise_model_from_file(FILE *f);
 
+/**
+ * Load a model from a file name
+ *
+ * It must be deallocated with rnnoise_model_free()
+ */
+RNNOISE_EXPORT RNNModel *rnnoise_model_from_filename(const char *filename);
+
 /**
  * Free a custom model
  *

src/denoise.c

@@ -224,18 +224,40 @@ static void apply_window(float *x) {
 }
 
 struct RNNModel {
-  unsigned char *blob;
+  /* Set either blob or const_blob. */
+  const void *const_blob;
+  void *blob;
   int blob_len;
+  FILE *file;
 };
 
+RNNModel *rnnoise_model_from_buffer(const void *ptr, int len) {
+  RNNModel *model;
+  model = malloc(sizeof(*model));
+  model->blob = NULL;
+  model->const_blob = ptr;
+  model->blob_len = len;
+  return model;
+}
+
+RNNModel *rnnoise_model_from_filename(const char *filename) {
+  RNNModel *model;
+  FILE *f = fopen(filename, "rb");
+  model = rnnoise_model_from_file(f);
+  model->file = f;
+  return model;
+}
+
 RNNModel *rnnoise_model_from_file(FILE *f) {
   RNNModel *model;
   model = malloc(sizeof(*model));
+  model->file = NULL;
 
   fseek(f, 0, SEEK_END);
   model->blob_len = ftell(f);
   fseek(f, 0, SEEK_SET);
 
+  model->const_blob = NULL;
   model->blob = malloc(model->blob_len);
   if (fread(model->blob, model->blob_len, 1, f) != 1)
   {
@@ -246,7 +268,8 @@ RNNModel *rnnoise_model_from_file(FILE *f) {
 }
 
 void rnnoise_model_free(RNNModel *model) {
-  free(model->blob);
+  if (model->file != NULL) fclose(model->file);
+  if (model->blob != NULL) free(model->blob);
   free(model);
 }
 
@@ -264,7 +287,7 @@ int rnnoise_init(DenoiseState *st, RNNModel *model) {
   if (model != NULL) {
     WeightArray *list;
     int ret = 1;
-    parse_weights(&list, model->blob, model->blob_len);
+    parse_weights(&list, model->blob ? model->blob : model->const_blob, model->blob_len);
     if (list != NULL) {
       ret = init_rnnoise(&st->model, list);
       opus_free(list);