tweaked lspd quantiser to fix some overload on hts1a, hts2a, mmt1, morig. Now no...

git-svn-id: https://svn.code.sf.net/p/freetel/code@729 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/codebook/dlsp1.txt b/codec2-dev/src/codebook/dlsp1.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..058d048d3c4e9fdf33ab23fa7f42a11e72e229a6 100644 (file)
--- a/codec2-dev/src/codebook/dlsp1.txt
+++ b/codec2-dev/src/codebook/dlsp1.txt
@@ -27,9 +27,9 @@
 650
 675
 700
-825
-850
-875
-900
+725
+750
+775
+800
 
 

diff --git a/codec2-dev/src/codebook/dlsp10.txt b/codec2-dev/src/codebook/dlsp10.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..058d048d3c4e9fdf33ab23fa7f42a11e72e229a6 100644 (file)
--- a/codec2-dev/src/codebook/dlsp10.txt
+++ b/codec2-dev/src/codebook/dlsp10.txt
@@ -27,9 +27,9 @@
 650
 675
 700
-825
-850
-875
-900
+725
+750
+775
+800
 
 

diff --git a/codec2-dev/src/codebook/dlsp2.txt b/codec2-dev/src/codebook/dlsp2.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..058d048d3c4e9fdf33ab23fa7f42a11e72e229a6 100644 (file)
--- a/codec2-dev/src/codebook/dlsp2.txt
+++ b/codec2-dev/src/codebook/dlsp2.txt
@@ -27,9 +27,9 @@
 650
 675
 700
-825
-850
-875
-900
+725
+750
+775
+800
 
 

diff --git a/codec2-dev/src/codebook/dlsp3.txt b/codec2-dev/src/codebook/dlsp3.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..058d048d3c4e9fdf33ab23fa7f42a11e72e229a6 100644 (file)
--- a/codec2-dev/src/codebook/dlsp3.txt
+++ b/codec2-dev/src/codebook/dlsp3.txt
@@ -27,9 +27,9 @@
 650
 675
 700
-825
-850
-875
-900
+725
+750
+775
+800
 
 

diff --git a/codec2-dev/src/codebook/dlsp4.txt b/codec2-dev/src/codebook/dlsp4.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..4a5e9902a4d19dbc544443988a231cde001e3c85 100644 (file)
--- a/codec2-dev/src/codebook/dlsp4.txt
+++ b/codec2-dev/src/codebook/dlsp4.txt
@@ -7,29 +7,29 @@
 150
 175
 200
-225
 250
-275
 300
-325
 350
-375
 400
-425
 450
-475
 500
-525
 550
-575
 600
-625
 650
-675
 700
-825
+750
+800
 850
-875
 900
+950
+1000
+1050
+1100
+1150
+1200
+1250
+1300
+1350
+1400
 
 

diff --git a/codec2-dev/src/codebook/dlsp5.txt b/codec2-dev/src/codebook/dlsp5.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..4a5e9902a4d19dbc544443988a231cde001e3c85 100644 (file)
--- a/codec2-dev/src/codebook/dlsp5.txt
+++ b/codec2-dev/src/codebook/dlsp5.txt
@@ -7,29 +7,29 @@
 150
 175
 200
-225
 250
-275
 300
-325
 350
-375
 400
-425
 450
-475
 500
-525
 550
-575
 600
-625
 650
-675
 700
-825
+750
+800
 850
-875
 900
+950
+1000
+1050
+1100
+1150
+1200
+1250
+1300
+1350
+1400
 
 

diff --git a/codec2-dev/src/codebook/dlsp6.txt b/codec2-dev/src/codebook/dlsp6.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..4a5e9902a4d19dbc544443988a231cde001e3c85 100644 (file)
--- a/codec2-dev/src/codebook/dlsp6.txt
+++ b/codec2-dev/src/codebook/dlsp6.txt
@@ -7,29 +7,29 @@
 150
 175
 200
-225
 250
-275
 300
-325
 350
-375
 400
-425
 450
-475
 500
-525
 550
-575
 600
-625
 650
-675
 700
-825
+750
+800
 850
-875
 900
+950
+1000
+1050
+1100
+1150
+1200
+1250
+1300
+1350
+1400
 
 

diff --git a/codec2-dev/src/codebook/dlsp7.txt b/codec2-dev/src/codebook/dlsp7.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..058d048d3c4e9fdf33ab23fa7f42a11e72e229a6 100644 (file)
--- a/codec2-dev/src/codebook/dlsp7.txt
+++ b/codec2-dev/src/codebook/dlsp7.txt
@@ -27,9 +27,9 @@
 650
 675
 700
-825
-850
-875
-900
+725
+750
+775
+800
 
 

diff --git a/codec2-dev/src/codebook/dlsp8.txt b/codec2-dev/src/codebook/dlsp8.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..058d048d3c4e9fdf33ab23fa7f42a11e72e229a6 100644 (file)
--- a/codec2-dev/src/codebook/dlsp8.txt
+++ b/codec2-dev/src/codebook/dlsp8.txt
@@ -27,9 +27,9 @@
 650
 675
 700
-825
-850
-875
-900
+725
+750
+775
+800
 
 

diff --git a/codec2-dev/src/codebook/dlsp9.txt b/codec2-dev/src/codebook/dlsp9.txt
index cc1046166a803db4630b4e1785c943bee6f3f4d1..058d048d3c4e9fdf33ab23fa7f42a11e72e229a6 100644 (file)
--- a/codec2-dev/src/codebook/dlsp9.txt
+++ b/codec2-dev/src/codebook/dlsp9.txt
@@ -27,9 +27,9 @@
 650
 675
 700
-825
-850
-875
-900
+725
+750
+775
+800
 
 

diff --git a/codec2-dev/src/codebookd.c b/codec2-dev/src/codebookd.c
index 7350b6c2d3d67ee58549415db35261730cd3fc73..48c35cf8c676cf10867288686d5e4445febb115d 100644 (file)
--- a/codec2-dev/src/codebookd.c
+++ b/codec2-dev/src/codebookd.c
@@ -37,10 +37,10 @@ static const float codes0[] = {
   650,
   675,
   700,
-  825,
-  850,
-  875,
-  900
+  725,
+  750,
+  775,
+  800
 };
   /* codebook/dlsp2.txt */
 static const float codes1[] = {
@@ -72,10 +72,10 @@ static const float codes1[] = {
   650,
   675,
   700,
-  825,
-  850,
-  875,
-  900
+  725,
+  750,
+  775,
+  800
 };
   /* codebook/dlsp3.txt */
 static const float codes2[] = {
@@ -107,10 +107,10 @@ static const float codes2[] = {
   650,
   675,
   700,
-  825,
-  850,
-  875,
-  900
+  725,
+  750,
+  775,
+  800
 };
   /* codebook/dlsp4.txt */
 static const float codes3[] = {
@@ -122,30 +122,30 @@ static const float codes3[] = {
   150,
   175,
   200,
-  225,
   250,
-  275,
   300,
-  325,
   350,
-  375,
   400,
-  425,
   450,
-  475,
   500,
-  525,
   550,
-  575,
   600,
-  625,
   650,
-  675,
   700,
-  825,
+  750,
+  800,
   850,
-  875,
-  900
+  900,
+  950,
+  1000,
+  1050,
+  1100,
+  1150,
+  1200,
+  1250,
+  1300,
+  1350,
+  1400
 };
   /* codebook/dlsp5.txt */
 static const float codes4[] = {
@@ -157,30 +157,30 @@ static const float codes4[] = {
   150,
   175,
   200,
-  225,
   250,
-  275,
   300,
-  325,
   350,
-  375,
   400,
-  425,
   450,
-  475,
   500,
-  525,
   550,
-  575,
   600,
-  625,
   650,
-  675,
   700,
-  825,
+  750,
+  800,
   850,
-  875,
-  900
+  900,
+  950,
+  1000,
+  1050,
+  1100,
+  1150,
+  1200,
+  1250,
+  1300,
+  1350,
+  1400
 };
   /* codebook/dlsp6.txt */
 static const float codes5[] = {
@@ -192,30 +192,30 @@ static const float codes5[] = {
   150,
   175,
   200,
-  225,
   250,
-  275,
   300,
-  325,
   350,
-  375,
   400,
-  425,
   450,
-  475,
   500,
-  525,
   550,
-  575,
   600,
-  625,
   650,
-  675,
   700,
-  825,
+  750,
+  800,
   850,
-  875,
-  900
+  900,
+  950,
+  1000,
+  1050,
+  1100,
+  1150,
+  1200,
+  1250,
+  1300,
+  1350,
+  1400
 };
   /* codebook/dlsp7.txt */
 static const float codes6[] = {
@@ -247,10 +247,10 @@ static const float codes6[] = {
   650,
   675,
   700,
-  825,
-  850,
-  875,
-  900
+  725,
+  750,
+  775,
+  800
 };
   /* codebook/dlsp8.txt */
 static const float codes7[] = {
@@ -282,10 +282,10 @@ static const float codes7[] = {
   650,
   675,
   700,
-  825,
-  850,
-  875,
-  900
+  725,
+  750,
+  775,
+  800
 };
   /* codebook/dlsp9.txt */
 static const float codes8[] = {
@@ -317,10 +317,10 @@ static const float codes8[] = {
   650,
   675,
   700,
-  825,
-  850,
-  875,
-  900
+  725,
+  750,
+  775,
+  800
 };
   /* codebook/dlsp10.txt */
 static const float codes9[] = {
@@ -352,10 +352,10 @@ static const float codes9[] = {
   650,
   675,
   700,
-  825,
-  850,
-  875,
-  900
+  725,
+  750,
+  775,
+  800
 };
 
 const struct lsp_codebook lsp_cbd[] = {

diff --git a/codec2-dev/src/quantise.c b/codec2-dev/src/quantise.c
index 0c3fbf39d92b41814c06a734bbc18f255580963c..1083836ad52ff27c94838b920037def1ada19a0e 100644 (file)
--- a/codec2-dev/src/quantise.c
+++ b/codec2-dev/src/quantise.c
@@ -163,6 +163,8 @@ void encode_lspds_scalar(
     for(i=0; i<order; i++)
        lsp_hz[i] = (4000.0/PI)*lsp[i];
 
+    //printf("\n");
+
     wt[0] = 1.0;
     for(i=0; i<order; i++) {
 
@@ -179,12 +181,13 @@ void encode_lspds_scalar(
        indexes[i] = quantise(cb, &dlsp[i], wt, k, m, &se);
        dlsp_[i] = cb[indexes[i]*k];
 
-       //printf("%d dlsp %3.2f dlsp_ %3.2f\n", i, dlsp[i], dlsp_[i]);
 
        if (i) 
            lsp__hz[i] = lsp__hz[i-1] + dlsp_[i];
        else
            lsp__hz[0] = dlsp_[0];
+       
+       //printf("%d lsp %3.2f dlsp %3.2f dlsp_ %3.2f lsp_ %3.2f\n", i, lsp_hz[i], dlsp[i], dlsp_[i], lsp__hz[i]);
     }
 
 }
@@ -214,6 +217,8 @@ void decode_lspds_scalar(
            lsp__hz[0] = dlsp_[0];
 
        lsp_[i] = (PI/4000.0)*lsp__hz[i];
+
+       //printf("%d dlsp_ %3.2f lsp_ %3.2f\n", i, dlsp_[i], lsp__hz[i]);
     }
 
 }