eden-emu/opus
14
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-05-15 16:08:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoiding symbol clashes with Opus

Browse source
This commit is contained in:
Jean-Marc Valin 2022-01-24 23:21:31 -05:00
parent 805fed733a
commit 2f5b51c94a
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dnn/lpcnet.c
View file

@ -100,11 +100,11 @@ void run_frame_network(LPCNetState *lpcnet, float *gru_a_condition, float *gru_b
compute_conv1d(&feature_conv2, conv2_out, net->feature_conv2_state, conv1_out); compute_conv1d(&feature_conv2, conv2_out, net->feature_conv2_state, conv1_out);
celt_assert(FRAME_INPUT_SIZE == FEATURE_CONV2_OUT_SIZE); celt_assert(FRAME_INPUT_SIZE == FEATURE_CONV2_OUT_SIZE);
if (lpcnet->frame_count < FEATURES_DELAY) RNN_CLEAR(conv2_out, 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); _lpcnet_compute_dense(&feature_dense1, dense1_out, conv2_out);
compute_dense(&feature_dense2, condition, dense1_out); _lpcnet_compute_dense(&feature_dense2, condition, dense1_out);
RNN_COPY(rc, condition, LPC_ORDER); RNN_COPY(rc, condition, LPC_ORDER);
compute_dense(&gru_a_dense_feature, gru_a_condition, condition); _lpcnet_compute_dense(&gru_a_dense_feature, gru_a_condition, condition);
compute_dense(&gru_b_dense_feature, gru_b_condition, condition); _lpcnet_compute_dense(&gru_b_dense_feature, gru_b_condition, condition);
#ifdef END2END #ifdef END2END
rc2lpc(lpc, rc); rc2lpc(lpc, rc);
#elif FEATURES_DELAY>0 #elif FEATURES_DELAY>0

2
dnn/nnet.c
View file

@ -113,7 +113,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)
{ {
int i; int i;
int N, M; int N, M;

2
dnn/nnet.h
View file

@ -96,7 +96,7 @@ typedef struct {
void compute_activation(float *output, const float *input, int N, int activation); 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); void compute_mdense(const MDenseLayer *layer, float *output, const float *input);