No more cheating, everything fully quantised

6 files changed, 163 insertions, 15 deletions

diff --git a/libcelt/Makefile.am b/libcelt/Makefile.am
index 87f870b..5c0780c 100644
--- a/libcelt/Makefile.am
+++ b/libcelt/Makefile.am
@@ -10,14 +10,14 @@ lib_LTLIBRARIES = libcelt.la
 
 # Sources for compilation in the library
 libcelt_la_SOURCES = bands.c celt.c cwrs.c fftwrap.c mdct.c modes.c pitch.c \
-	quant_bands.c smallft.c vq.c
+	quant_bands.c quant_pitch.c smallft.c vq.c
 
 #noinst_HEADERS =
 
 libcelt_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
 
 noinst_HEADERS = arch.h bands.h celt.h cwrs.h fftwrap.h mdct.h modes.h \
-	os_support.h pitch.h quant_bands.h smallft.h vq.h
+	os_support.h pitch.h quant_bands.h quant_pitch.h smallft.h vq.h
 
 noinst_PROGRAMS = testcelt
 testcelt_SOURCES = testcelt.c
diff --git a/libcelt/celt.c b/libcelt/celt.c
index b5d0c21..99fe097 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -38,12 +38,11 @@
 #include "bands.h"
 #include "modes.h"
 #include "probenc.h"
+#include "quant_pitch.h"
+#include "quant_bands.h"
 
 #define MAX_PERIOD 1024
 
-/* This is only for cheating until the decoder is complete */
-float cheating_pitch_gains[100];
-
 
 struct CELTEncoder {
    const CELTMode *mode;
@@ -230,11 +229,8 @@ int celt_encode(CELTEncoder *st, short *pcm)
    
    /* Pitch prediction */
    compute_pitch_gain(st->mode, X, P, gains, bandE);
-   //quantise_pitch(gains, PBANDS);
+   quant_pitch(gains, st->mode->nbPBands, &st->enc);
    pitch_quant_bands(st->mode, X, P, gains);
-   
-   for (i=0;i<st->mode->nbPBands;i++)
-      cheating_pitch_gains[i] = gains[i];
 
    //for (i=0;i<B*N;i++) printf("%f ",P[i]);printf("\n");
    /* Subtract the pitch prediction from the signal to encode */
@@ -415,8 +411,7 @@ int celt_decode(CELTDecoder *st, char *data, int len, short *pcm)
    }
 
    /* Get the pitch gains */
-   for (i=0;i<st->mode->nbPBands;i++)
-      gains[i] = cheating_pitch_gains[i];
+   unquant_pitch(gains, st->mode->nbPBands, &dec);
 
    /* Apply pitch gains */
    pitch_quant_bands(st->mode, X, P, gains);
diff --git a/libcelt/quant_bands.c b/libcelt/quant_bands.c
index 678ce4f..72b762a 100644
--- a/libcelt/quant_bands.c
+++ b/libcelt/quant_bands.c
@@ -44,7 +44,7 @@ static const int decay[15] = {
    14800, 13800, 12600, 12000, 11000, 10000, 9800, 8400, 8000, 7500, 7000, 7000, 7000, 6000, 6000
 };
 
-void quant_energy(CELTMode *m, float *eBands, float *oldEBands, ec_enc *enc)
+void quant_energy(const CELTMode *m, float *eBands, float *oldEBands, ec_enc *enc)
 {
    int i;
    float prev = 0;
@@ -76,7 +76,7 @@ void quant_energy(CELTMode *m, float *eBands, float *oldEBands, ec_enc *enc)
    //printf ("\n");
 }
 
-void unquant_energy(CELTMode *m, float *eBands, float *oldEBands, ec_dec *dec)
+void unquant_energy(const CELTMode *m, float *eBands, float *oldEBands, ec_dec *dec)
 {
    int i;
    float prev = 0;
diff --git a/libcelt/quant_bands.h b/libcelt/quant_bands.h
index 0735ab9..225cacf 100644
--- a/libcelt/quant_bands.h
+++ b/libcelt/quant_bands.h
@@ -36,8 +36,8 @@
 #include "entenc.h"
 #include "entdec.h"
 
-void quant_energy(CELTMode *m, float *eBands, float *oldEBands, ec_enc *enc);
+void quant_energy(const CELTMode *m, float *eBands, float *oldEBands, ec_enc *enc);
 
-void unquant_energy(CELTMode *m, float *eBands, float *oldEBands, ec_dec *dec);
+void unquant_energy(const CELTMode *m, float *eBands, float *oldEBands, ec_dec *dec);
 
 #endif /* QUANT_BANDS */
diff --git a/libcelt/quant_pitch.c b/libcelt/quant_pitch.c
new file mode 100644
index 0000000..eac7769
--- /dev/null
+++ b/libcelt/quant_pitch.c
@@ -0,0 +1,110 @@
+/* (C) 2007 Jean-Marc Valin, CSIRO
+*/
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+   
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   
+   - Neither the name of the Xiph.org Foundation nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "quant_pitch.h"
+ 
+static const float cdbk_pitch[]={     0.00826816, 0.00646836, 0.00520978, 0.00632398, 0.0108199 ,
+   0.723347, 0.0985132, 0.630212, 0.0546661, 0.0246779 ,
+   0.802152, 0.759963, 0.453441, 0.384415, 0.0625198 ,
+   0.461809, 0.313537, 0.0465707, 0.0484357, 0.0196977 ,
+   0.704463, 0.117481, 0.0612584, 0.576791, 0.0273508 ,
+   0.798109, 0.743359, 0.706289, 0.0697711, 0.0386172 ,
+   0.228351, 0.0379557, 0.0285191, 0.0236265, 0.0248726 ,
+   0.114495, 0.279541, 0.038657, 0.0342054, 0.0319817 ,
+   0.609812, 0.0397131, 0.0266344, 0.0239864, 0.0212439 ,
+   0.781349, 0.493848, 0.0353301, 0.0267205, 0.0196015 ,
+   0.0819145, 0.0543806, 0.301274, 0.0507369, 0.0456495 ,
+   0.785118, 0.7315, 0.213724, 0.675786, 0.117822 ,
+   0.791656, 0.0322449, 0.0200075, 0.0203656, 0.0191236 ,
+   0.768495, 0.416117, 0.386172, 0.0510886, 0.022891 ,
+   0.802694, 0.790402, 0.755665, 0.71349, 0.401332 ,
+   0.142781, 0.122736, 0.195102, 0.587634, 0.0490036 ,
+   0.104903, 0.611318, 0.0587345, 0.0822444, 0.028738 ,
+   0.182943, 0.541788, 0.518271, 0.0920779, 0.0338024 ,
+   0.76004, 0.0553314, 0.293129, 0.0392962, 0.0191814 ,
+   0.776575, 0.257797, 0.0323301, 0.0290356, 0.0185467 ,
+   0.798177, 0.759494, 0.368838, 0.0497087, 0.0262797 ,
+   0.724, 0.0643148, 0.0435992, 0.275742, 0.0232963 ,
+   0.803454, 0.783768, 0.741939, 0.711135, 0.0950338 ,
+   0.138766, 0.0770751, 0.649913, 0.129772, 0.0342524 ,
+   0.795955, 0.754889, 0.044966, 0.0279729, 0.0199437 ,
+   0.784278, 0.659435, 0.0713927, 0.339058, 0.0384502 ,
+   0.145974, 0.049395, 0.0403857, 0.302676, 0.04925 ,
+   0.428821, 0.0640999, 0.368384, 0.0519584, 0.0224072 ,
+   0.425792, 0.0341016, 0.0290549, 0.0390711, 0.0227266 ,
+   0.453561, 0.623889, 0.0443806, 0.0432896, 0.0173471 ,
+   0.754851, 0.236843, 0.570091, 0.48421, 0.0622915 ,
+   0.804932, 0.782549, 0.752207, 0.390957, 0.102058    
+};
+
+/* Taken from Speex.
+   Finds the index of the entry in a codebook that best matches the input*/
+int vq_index(float *in, const float *codebook, int len, int entries)
+{
+   int i,j;
+   float min_dist=0;
+   int best_index=0;
+   for (i=0;i<entries;i++)
+   {
+      float dist=0;
+      for (j=0;j<len;j++)
+      {
+         float tmp = in[j]-*codebook++;
+         dist += tmp*tmp;
+      }
+      if (i==0 || dist<min_dist)
+      {
+         min_dist=dist;
+         best_index=i;
+      }
+   }
+   return best_index;
+}
+
+void quant_pitch(float *gains, int len, ec_enc *enc)
+{
+   int i, id;
+   float g2[len];
+   for (i=0;i<len;i++)
+      g2[i] = gains[i]*gains[i];
+   id = vq_index(g2, cdbk_pitch, len, 32);
+   ec_enc_uint(enc, id, 32);
+   for (i=0;i<len;i++)
+      gains[i] = sqrt(cdbk_pitch[id*len+i]);
+}
+
+void unquant_pitch(float *gains, int len, ec_dec *dec)
+{
+   int i, id;
+   id = ec_dec_uint(dec, 32);
+   for (i=0;i<len;i++)
+      gains[i] = sqrt(cdbk_pitch[id*len+i]);
+}
diff --git a/libcelt/quant_pitch.h b/libcelt/quant_pitch.h
new file mode 100644
index 0000000..99c21b0
--- /dev/null
+++ b/libcelt/quant_pitch.h
@@ -0,0 +1,43 @@
+/* (C) 2007 Jean-Marc Valin, CSIRO
+*/
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+   
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   
+   - Neither the name of the Xiph.org Foundation nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef QUANT_PITCH_H
+#define QUANT_PITCH_H
+
+#include "entenc.h"
+#include "entdec.h"
+
+void quant_pitch(float *gains, int len, ec_enc *enc);
+
+
+void unquant_pitch(float *gains, int len, ec_dec *dec);
+
+#endif /* QUANT_PITCH_H */