From 972ef53c666367dd79f453729a09ef6b1e848f74 Mon Sep 17 00:00:00 2001 From: baobrien Date: Sat, 7 Mar 2015 06:51:55 +0000 Subject: [PATCH] Rolling back accidental changes from first commit git-svn-id: https://svn.code.sf.net/p/freetel/code@2060 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/src/codec2.c | 3 ++- codec2-dev/src/postfilter.c | 2 +- codec2-dev/src/quantise.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/codec2-dev/src/codec2.c b/codec2-dev/src/codec2.c index 08604a55..2f63d88f 100644 --- a/codec2-dev/src/codec2.c +++ b/codec2-dev/src/codec2.c @@ -418,11 +418,12 @@ void codec2_decode_3200(struct CODEC2 *c2, short speech[], const unsigned char * interp_Wo(&model[0], &c2->prev_model_dec, &model[1]); e[0] = interp_energy(c2->prev_e_dec, e[1]); - + /* LSPs are sampled every 20ms so we interpolate the frame in between, then recover spectral amplitudes */ interpolate_lsp_ver2(&lsps[0][0], c2->prev_lsps_dec, &lsps[1][0], 0.5); + for(i=0; i<2; i++) { lsp_to_lpc(&lsps[i][0], &ak[i][0], LPC_ORD); aks_to_M2(c2->fft_fwd_cfg, &ak[i][0], LPC_ORD, &model[i], e[i], &snr, 0, 0, diff --git a/codec2-dev/src/postfilter.c b/codec2-dev/src/postfilter.c index f347658c..fc88c0ea 100644 --- a/codec2-dev/src/postfilter.c +++ b/codec2-dev/src/postfilter.c @@ -111,7 +111,7 @@ void postfilter( e = 1E-12; for(m=1; m<=model->L; m++) e += model->A[m]*model->A[m]; - + assert(e > 0.0); e = 10.0*log10f(e/model->L); diff --git a/codec2-dev/src/quantise.c b/codec2-dev/src/quantise.c index 03b9812e..10538041 100644 --- a/codec2-dev/src/quantise.c +++ b/codec2-dev/src/quantise.c @@ -941,8 +941,9 @@ void aks_to_M2( /* Determine power spectrum P(w) = E/(A(exp(jw))^2 ------------------------*/ - for(i=0; i