C implementation of LACE feature net in osce.c

xiph · Nov 28, 2023 · 30b75b3 · 30b75b3
1 parent e9d3083
commit 30b75b3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/dnn/nndsp.h b/dnn/nndsp.h
@@ -17,7 +17,7 @@
 #define ADACOMB_MAX_FRAME_SIZE 80
 #define ADACOMB_MAX_OVERLAP_SIZE 40
 
-//#define DEBUG_NNDSP
+#define DEBUG_NNDSP
 #ifdef DEBUG_NNDSP
 #include <stdio.h>
 #endif

diff --git a/dnn/osce.h b/dnn/osce.h
@@ -3,16 +3,32 @@
 
 
 #include "opus_types.h"
+#include "lace_data.h"
+#include "nolace_data.h"
+#include "nndsp.h"
+#include "nnet.h"
 
 extern const WeightArray lacelayers_arrays[];
 extern const WeightArray nolacelayers_arrays[];
 
-typedef struct LACE LACE;
-typedef struct NOLACE NOLACE;
+typedef struct {
+    float feature_net_conv2_state[LACE_FEATURE_NET_CONV2_STATE_SIZE];
+    float feature_net_gru_state[LACE_COND_DIM]; /* ToDo: fix! */
+    AdaCombState cf1_state;
+    AdaCombState cf2_state;
+    AdaConvState af1_state;
+} LACEState;
+
+typedef struct
+{
+    LACELayers layers;
+    LACEState state;
+    float window[LACE_OVERLAP_SIZE];
+} LACE;
 
-typedef struct LACEState LACEState;
+typedef struct NOLACE NOLACE;
 typedef struct NoLACEState NoLACEState;
 
-
+void init_lace(LACE *hLACE);
 
 #endif