From: drowe67 Date: Tue, 6 Jun 2017 03:51:39 +0000 (+0000) Subject: fixed sensitivity to log(0) errors when importing via --amread X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=b5a4a00b1ebeeda896e7072dae8dbdd89ef9ac70;p=freetel-svn-tracking.git fixed sensitivity to log(0) errors when importing via --amread git-svn-id: https://svn.code.sf.net/p/freetel/code@3156 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/codec2-dev/src/c2sim.c b/codec2-dev/src/c2sim.c index e25450e5..f2d37519 100644 --- a/codec2-dev/src/c2sim.c +++ b/codec2-dev/src/c2sim.c @@ -888,11 +888,12 @@ int main(int argc, char *argv[]) int ret = fread(H, sizeof(COMP), MAX_AMP, fhm); assert(ret == MAX_AMP); } else { - determine_phase(&c2const, H, &model_dec[i], NEWAMP1_PHASE_NFFT, phase_fft_fwd_cfg, phase_fft_inv_cfg); - //sample_phase(&model_dec[i], H, Aw); + determine_phase(&c2const, H, &model_dec[i], NEWAMP1_PHASE_NFFT, phase_fft_fwd_cfg, phase_fft_inv_cfg); } phase_synth_zero_order(n_samp, &model_dec[i], ex_phase, H); } + + if (postfilt) postfilter(&model_dec[i], &bg_est); synth_one_frame(n_samp, fftr_inv_cfg, buf, &model_dec[i], Sn_, Pn, prede, &de_mem, gain); diff --git a/codec2-dev/src/newamp1.c b/codec2-dev/src/newamp1.c index b2e44373..f6af1b83 100644 --- a/codec2-dev/src/newamp1.c +++ b/codec2-dev/src/newamp1.c @@ -376,7 +376,7 @@ void determine_phase(C2CONST *c2const, COMP H[], MODEL *model, int Nfft, codec2_ float AmdB[MAX_AMP+1], rate_L_sample_freqs_kHz[MAX_AMP+1]; for(m=1; m<=model->L; m++) { - AmdB[m] = 20.0*log10(model->A[m]); + AmdB[m] = 20.0*log10f(model->A[m]+1); rate_L_sample_freqs_kHz[m] = (float)m*model->Wo*(c2const->Fs/2000.0)/M_PI; }