diff --git a/dnn/dump_data.c b/dnn/dump_data.c index e4c78c7e..65b9639b 100644 --- a/dnn/dump_data.c +++ b/dnn/dump_data.c @@ -68,13 +68,6 @@ static void rand_resp(float *a, float *b) { b[1] = .75*uni_rand(); } -void compute_noise(int *noise, float noise_std) { - int i; - for (i=0;ifeatures[NB_BANDS+2+j]*st->sig_mem[j]; - e = lin2ulaw(pcm[i] - p); - /* Signal in. */ - data[2*i] = float2short(st->sig_mem[0]); - /* Signal out. */ - data[2*i+1] = pcm[i]; - /* Simulate error on excitation. */ - e += noise[i]; - e = IMIN(255, IMAX(0, e)); - - OPUS_MOVE(&st->sig_mem[1], &st->sig_mem[0], LPC_ORDER-1); - st->sig_mem[0] = p + ulaw2lin(e); - } - fwrite(data, 4*FRAME_SIZE, 1, file); -} - int main(int argc, char **argv) { int i; char *argv0; @@ -123,13 +92,11 @@ int main(int argc, char **argv) { FILE *ffeat; FILE *fpcm=NULL; opus_int16 pcm[FRAME_SIZE]={0}; - int noisebuf[FRAME_SIZE]={0}; opus_int16 tmp[FRAME_SIZE] = {0}; float speech_gain=1; float old_speech_gain = 1; int one_pass_completed = 0; LPCNetEncState *st; - float noise_std=0; int training = -1; int burg = 0; int pitch = 0; @@ -202,16 +169,12 @@ int main(int argc, char **argv) { for (i=0;i=10000000 && one_pass_completed) break; if (training && ++gain_change_count > 2821) { - float tmp1, tmp2; speech_gain = pow(10., (-30+(rand()%40))/20.); if (rand()&1) speech_gain = -speech_gain; if (rand()%20==0) speech_gain *= .01; if (!pitch && rand()%100==0) speech_gain = 0; gain_change_count = 0; rand_resp(a_sig, b_sig); - tmp1 = rand()/(float)RAND_MAX; - tmp2 = rand()/(float)RAND_MAX; - noise_std = ABS16(-1.5*log(1e-4+tmp1)-.5*log(1e-4+tmp2)); if (fnoise != NULL) { long pos; /* Randomize the fraction because rand() only gives us 31 bits. */ @@ -244,15 +207,10 @@ int main(int argc, char **argv) { fwrite(ceps, sizeof(float), 2*NB_BANDS, ffeat); } preemphasis(x, &mem_preemph, x, PREEMPHASIS, FRAME_SIZE); - for (i=0;ifeatures, sizeof(float), NB_TOTAL_FEATURES, ffeat); } /*if(pitch) fwrite(pcm, FRAME_SIZE, 2, stdout);*/ - if (fpcm) write_audio(st, pcm, noisebuf, fpcm); + if (fpcm) fwrite(pcm, FRAME_SIZE, 2, fpcm); /*if (fpcm) fwrite(pcm, sizeof(opus_int16), FRAME_SIZE, fpcm);*/ for (i=0;i