diff options
| author | Jean-Marc Valin <jmvalin@amazon.com> | 2023-10-11 20:24:25 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@amazon.com> | 2023-10-11 20:24:25 +0300 |
| commit | a25dca4e376f3e1c8c2959bdb98f7469e40d8e5c (patch) | |
| tree | 8869d704b8ea15531b39b49e6fd73afccbf224f5 | |
| parent | 806ef4140d6405b0111377aab5a6b73bfbfc94c1 (diff) | |
more fixes
| -rw-r--r-- | dnn/fargan.c | 2 | ||||
| -rw-r--r-- | dnn/fargan.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dnn/fargan.c b/dnn/fargan.c index 76aed3d1..313d5522 100644 --- a/dnn/fargan.c +++ b/dnn/fargan.c @@ -103,7 +103,7 @@ static void run_fargan_subframe(FARGANState *st, float *pcm, const float *cond, pos++; if (pos == PITCH_MAX_PERIOD) pos -= period; } - for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) prev[i] = gain_1*st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE+i]; + for (i=0;i<FARGAN_SUBFRAME_SIZE;i++) prev[i] = MAX32(-1.f, MIN16(1.f, gain_1*st->pitch_buf[PITCH_MAX_PERIOD-FARGAN_SUBFRAME_SIZE+i])); OPUS_COPY(&fwc0_in[0], &cond[0], FARGAN_COND_SIZE); OPUS_COPY(&fwc0_in[FARGAN_COND_SIZE], pred, FARGAN_SUBFRAME_SIZE+4); diff --git a/dnn/fargan.h b/dnn/fargan.h index e3fc3b8b..ecbcf291 100644 --- a/dnn/fargan.h +++ b/dnn/fargan.h @@ -35,7 +35,7 @@ #define FARGAN_NB_SUBFRAMES 4 #define FARGAN_SUBFRAME_SIZE 40 #define FARGAN_FRAME_SIZE (FARGAN_NB_SUBFRAMES*FARGAN_SUBFRAME_SIZE) -#define FARGAN_COND_SIZE (COND_NET_FCONV2_OUT_SIZE/FARGAN_SUBFRAME_SIZE) +#define FARGAN_COND_SIZE (COND_NET_FCONV2_OUT_SIZE/FARGAN_NB_SUBFRAMES) #define FARGAN_DEEMPHASIS 0.85f #define SIG_NET_INPUT_SIZE (FARGAN_COND_SIZE+2*FARGAN_SUBFRAME_SIZE+4) |