Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.xiph.org/xiph/opus.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Buethe <jbuethe@amazon.de>2024-01-22 17:12:26 +0300
committerJan Buethe <jbuethe@amazon.de>2024-01-22 17:12:26 +0300
commit5f8201c71ee81a9eb7bb302d1bd72fe15678d213 (patch)
treef9519d812e5b7ff8b500fb3b0dd403834a9a16f6
parent6a9831a6b038638266165dc1e9f115678f0b330e (diff)
OSCE_MAX_RNN_UNITS now derived from osce model parameters
-rw-r--r--dnn/nnet.c2
-rw-r--r--dnn/osce.h3
-rw-r--r--dnn/osce_config.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/dnn/nnet.c b/dnn/nnet.c
index 8ac4518e..184ec4e2 100644
--- a/dnn/nnet.c
+++ b/dnn/nnet.c
@@ -42,7 +42,7 @@
#include "vec.h"
#ifdef ENABLE_OSCE
-#include "osce_config.h"
+#include "osce.h"
#endif
#ifdef NO_OPTIMIZATIONS
diff --git a/dnn/osce.h b/dnn/osce.h
index 3dd8b7c0..1bffbf0e 100644
--- a/dnn/osce.h
+++ b/dnn/osce.h
@@ -52,10 +52,13 @@
#if !defined(DISABLE_NOLACE)
#define OSCE_DEFAULT_METHOD OSCE_METHOD_NOLACE
+#define OSCE_MAX_RNN_NEURONS NOLACE_FNET_GRU_STATE_SIZE
#elif !defined(DISABLE_LACE)
#define OSCE_DEFAULT_METHOD OSCE_METHOD_LACE
+#define OSCE_MAX_RNN_NEURONS LACE_FNET_GRU_STATE_SIZE
#else
#define OSCE_DEFAULT_METHOD OSCE_METHOD_NONE
+#define OSCE_MAX_RNN_NEURONS 0
#endif
diff --git a/dnn/osce_config.h b/dnn/osce_config.h
index 1543b803..0298befb 100644
--- a/dnn/osce_config.h
+++ b/dnn/osce_config.h
@@ -28,8 +28,6 @@
#ifndef OSCE_CONFIG
#define OSCE_CONFIG
-#define OSCE_MAX_RNN_NEURONS 256
-
#define OSCE_FEATURES_MAX_HISTORY 350
#define OSCE_FEATURE_DIM 93
#define OSCE_MAX_FEATURE_FRAMES 4