shithub: opus

Download patch

ref: 80383b637791c652de7b5010a5601d6d8802206d
parent: 79d4f126775743836278818fc810c7e6b89658f9
parent: 8accadcc85f44fd461e496529ab0e9382df8efe0
author: Jan Buethe <jbuethe@amazon.de>
date: Mon Oct 24 07:00:50 EDT 2022 

Merge branch 'exp_rdovae6' of https://github.com/xiph/LPCNet into exp_rdovae6


--- a/dnn/kiss_fft.c
+++ b/dnn/kiss_fft.c
@@ -506,10 +506,10 @@
    if (cfg)
    {
       opus_fft_free_arch((kiss_fft_state *)cfg, arch);
-      opus_free((opus_int16*)cfg->bitrev);
+      free((opus_int16*)cfg->bitrev);
       if (cfg->shift < 0)
-         opus_free((kiss_twiddle_cpx*)cfg->twiddles);
-      opus_free((kiss_fft_state*)cfg);
+         free((kiss_twiddle_cpx*)cfg->twiddles);
+      free((kiss_fft_state*)cfg);
    }
 }
 
--- a/dnn/kiss_fft.h
+++ b/dnn/kiss_fft.h
@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 #define opus_alloc(x) malloc(x)
-#define opus_free(x) free(x)
+//#define opus_free(x) free(x)
 
 #ifdef __cplusplus
 extern "C" {
--- a/dnn/training_tf2/dump_rdovae.py
+++ b/dnn/training_tf2/dump_rdovae.py
@@ -25,8 +25,6 @@
 #ifndef {header_guard}
 #define {header_guard}
 
-#include "nnet.h"
-
 """
     )
 
@@ -119,6 +117,14 @@
     start_header(header_fid, "dred_rdovae_enc_data.h")
     start_source(source_fid, "dred_rdovae_enc_data.h", os.path.basename(args.weights))
 
+    header_fid.write(
+f"""
+#include "dred_rdovae_constants.h"
+
+#include "nnet.h"
+"""
+    )
+
     # dump GRUs
     max_rnn_neurons_enc = max(
         [
@@ -143,7 +149,6 @@
     # some global constants
     header_fid.write(
 f"""
-#include "dred_rdovae_constants.h"
 
 #define DRED_ENC_MAX_RNN_NEURONS {max_rnn_neurons_enc}
 
@@ -206,7 +211,13 @@
     start_header(header_fid, "dred_rdovae_dec_data.h")
     start_source(source_fid, "dred_rdovae_dec_data.h", os.path.basename(args.weights))
 
+    header_fid.write(
+f"""
+#include "dred_rdovae_constants.h"
 
+#include "nnet.h"
+"""
+    )
 
 
     # dump GRUs
@@ -225,7 +236,6 @@
     # some global constants
     header_fid.write(
 f"""
-#include "dred_rdovae_constants.h"
 
 #define DRED_DEC_MAX_RNN_NEURONS {max_rnn_neurons_dec}
 
@@ -247,6 +257,8 @@
 #define DRED_NUM_FEATURES 20
 
 #define DRED_LATENT_DIM {args.latent_dim}
+
+#define DRED_STATE_DIM {24}
 
 #define DRED_NUM_QUANTIZATION_LEVELS {qembedding.weights[0].shape[0]}
 
-- 
⑨