diff options
author | Jean-Marc Valin <jmvalin@amazon.com> | 2023-05-15 15:04:21 -0400 |
---|---|---|
committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-05-15 15:04:21 -0400 |
commit | 577dd7bcd765fd07a185591bfc5eaa4fdb1bc5a0 (patch) | |
tree | 1198e7d8ba14ef2137a40bd625031f93a9e8d067 | |
parent | b4aeae42a541e58e7886662cc3a0db19d248d473 (diff) | |
download | opus-577dd7bcd765fd07a185591bfc5eaa4fdb1bc5a0.tar.gz |
Rename Opus DNN functions
Avoids conflict with LPCNet, so that LPCNet headers can be included in
Opus
m--------- | lpcnet | 0 | ||||
-rw-r--r-- | src/analysis.c | 6 | ||||
-rw-r--r-- | src/mlp.c | 4 | ||||
-rw-r--r-- | src/mlp.h | 14 | ||||
-rw-r--r-- | src/mlp_data.c | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/lpcnet b/lpcnet -Subproject 9b7039b5b9d337c5750f16754c054778e764eb3 +Subproject 7bf08dfe74ae53dea90f80afe504decbc53ced8 diff --git a/src/analysis.c b/src/analysis.c index 058328f0..1f580138 100644 --- a/src/analysis.c +++ b/src/analysis.c @@ -929,9 +929,9 @@ static void tonality_analysis(TonalityAnalysisState *tonal, const CELTMode *celt features[23] = info->tonality_slope + 0.069216f; features[24] = tonal->lowECount - 0.067930f; - compute_dense(&layer0, layer_out, features); - compute_gru(&layer1, tonal->rnn_state, layer_out); - compute_dense(&layer2, frame_probs, tonal->rnn_state); + analysis_compute_dense(&layer0, layer_out, features); + analysis_compute_gru(&layer1, tonal->rnn_state, layer_out); + analysis_compute_dense(&layer2, frame_probs, tonal->rnn_state); /* Probability of speech or music vs noise */ info->activity_probability = frame_probs[1]; @@ -79,7 +79,7 @@ static void gemm_accum(float *out, const opus_int8 *weights, int rows, int cols, } } -void compute_dense(const DenseLayer *layer, float *output, const float *input) +void analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, const float *input) { int i; int N, M; @@ -101,7 +101,7 @@ void compute_dense(const DenseLayer *layer, float *output, const float *input) } } -void compute_gru(const GRULayer *gru, float *state, const float *input) +void analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input) { int i; int N, M; @@ -39,7 +39,7 @@ typedef struct { int nb_inputs; int nb_neurons; int sigmoid; -} DenseLayer; +} AnalysisDenseLayer; typedef struct { const opus_int8 *bias; @@ -47,14 +47,14 @@ typedef struct { const opus_int8 *recurrent_weights; int nb_inputs; int nb_neurons; -} GRULayer; +} AnalysisGRULayer; -extern const DenseLayer layer0; -extern const GRULayer layer1; -extern const DenseLayer layer2; +extern const AnalysisDenseLayer layer0; +extern const AnalysisGRULayer layer1; +extern const AnalysisDenseLayer layer2; -void compute_dense(const DenseLayer *layer, float *output, const float *input); +void analysis_compute_dense(const AnalysisDenseLayer *layer, float *output, const float *input); -void compute_gru(const GRULayer *gru, float *state, const float *input); +void analysis_compute_gru(const AnalysisGRULayer *gru, float *state, const float *input); #endif /* _MLP_H_ */ diff --git a/src/mlp_data.c b/src/mlp_data.c index ae4178df..65f7448e 100644 --- a/src/mlp_data.c +++ b/src/mlp_data.c @@ -651,20 +651,20 @@ static const opus_int8 layer2_bias[2] = { 14, 117 }; -const DenseLayer layer0 = { +const AnalysisDenseLayer layer0 = { layer0_bias, layer0_weights, 25, 32, 0 }; -const GRULayer layer1 = { +const AnalysisGRULayer layer1 = { layer1_bias, layer1_weights, layer1_recur_weights, 32, 24 }; -const DenseLayer layer2 = { +const AnalysisDenseLayer layer2 = { layer2_bias, layer2_weights, 24, 2, 1 |