diff options
| author | Jean-Marc Valin <jmvalin@amazon.com> | 2023-10-11 20:06:41 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-10-11 20:06:41 +0300 |
| commit | 806ef4140d6405b0111377aab5a6b73bfbfc94c1 (patch) | |
| tree | 0676319cbae68c216717ba65aa045697531ede56 | |
| parent | d28a8c7e60a9fd16e0583580bebc85a1729bd767 (diff) | |
conditioning matches
| -rw-r--r-- | dnn/fargan.c | 2 | ||||
| -rw-r--r-- | dnn/lpcnet_demo.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dnn/fargan.c b/dnn/fargan.c index df368782..76aed3d1 100644 --- a/dnn/fargan.c +++ b/dnn/fargan.c @@ -49,7 +49,7 @@ static void compute_fargan_cond(FARGANState *st, float *cond, const float *featu celt_assert(FARGAN_FEATURES+COND_NET_PEMBED_OUT_SIZE == model->cond_net_fdense1.nb_inputs); celt_assert(COND_NET_FCONV1_IN_SIZE == model->cond_net_fdense1.nb_outputs); celt_assert(COND_NET_FCONV2_IN_SIZE == model->cond_net_fconv1.nb_outputs); - OPUS_COPY(&dense_in[NB_FEATURES], &model->cond_net_pembed.float_weights[IMIN(period, 224)*COND_NET_PEMBED_OUT_SIZE], COND_NET_PEMBED_OUT_SIZE); + OPUS_COPY(&dense_in[NB_FEATURES], &model->cond_net_pembed.float_weights[IMAX(0,IMIN(period-32, 224))*COND_NET_PEMBED_OUT_SIZE], COND_NET_PEMBED_OUT_SIZE); OPUS_COPY(dense_in, features, NB_FEATURES); compute_generic_dense(&model->cond_net_fdense1, conv1_in, dense_in, ACTIVATION_TANH); diff --git a/dnn/lpcnet_demo.c b/dnn/lpcnet_demo.c index b0dcf41c..6e257f60 100644 --- a/dnn/lpcnet_demo.c +++ b/dnn/lpcnet_demo.c @@ -215,17 +215,18 @@ int main(int argc, char **argv) { } } else if (mode == MODE_FARGAN_SYNTHESIS) { FARGANState fargan; - size_t ret; - float in_features[NB_FEATURES*5]={0}; + size_t ret, i; + float in_features[5*NB_TOTAL_FEATURES]; float zeros[320] = {0}; fargan_init(&fargan); #ifdef USE_WEIGHTS_FILE fargan_load_model(fwgan, data, len); #endif - //ret = fread(in_features, sizeof(in_features[0]), NB_TOTAL_FEATURES, fin); + for (i=0;i<5;i++) { + ret = fread(&in_features[i*NB_FEATURES], sizeof(in_features[0]), NB_TOTAL_FEATURES, fin); + } fargan_cont(&fargan, zeros, in_features); while (1) { - int i; float features[NB_FEATURES]; float fpcm[LPCNET_FRAME_SIZE]; opus_int16 pcm[LPCNET_FRAME_SIZE]; |