shithub: opus

Info  •  Files  •  Log  •  Branches

Avoiding symbol clashes with Opus

--- a/dnn/lpcnet.c

+++ b/dnn/lpcnet.c

@@ -100,11 +100,11 @@

     compute_conv1d(&feature_conv2, conv2_out, net->feature_conv2_state, conv1_out);

     celt_assert(FRAME_INPUT_SIZE == FEATURE_CONV2_OUT_SIZE);

     if (lpcnet->frame_count < FEATURES_DELAY) RNN_CLEAR(conv2_out, FEATURE_CONV2_OUT_SIZE);

-    compute_dense(&feature_dense1, dense1_out, conv2_out);

-    compute_dense(&feature_dense2, condition, dense1_out);

+    _lpcnet_compute_dense(&feature_dense1, dense1_out, conv2_out);

+    _lpcnet_compute_dense(&feature_dense2, condition, dense1_out);

     RNN_COPY(rc, condition, LPC_ORDER);

-    compute_dense(&gru_a_dense_feature, gru_a_condition, condition);

-    compute_dense(&gru_b_dense_feature, gru_b_condition, condition);

+    _lpcnet_compute_dense(&gru_a_dense_feature, gru_a_condition, condition);

+    _lpcnet_compute_dense(&gru_b_dense_feature, gru_b_condition, condition);

 #ifdef END2END

     rc2lpc(lpc, rc);

 #elif FEATURES_DELAY>0    

--- a/dnn/nnet.c

+++ b/dnn/nnet.c

@@ -113,7 +113,7 @@

    }

 }

-void compute_dense(const DenseLayer *layer, float *output, const float *input)

+void _lpcnet_compute_dense(const DenseLayer *layer, float *output, const float *input)

 {

    int i;

    int N, M;

--- a/dnn/nnet.h

+++ b/dnn/nnet.h

@@ -96,7 +96,7 @@

 void compute_activation(float *output, const float *input, int N, int activation);

-void compute_dense(const DenseLayer *layer, float *output, const float *input);

+void _lpcnet_compute_dense(const DenseLayer *layer, float *output, const float *input);

 void compute_mdense(const MDenseLayer *layer, float *output, const float *input);

-- 

⑨