shithub: opus

Info  •  Files  •  Log  •  Branches

Removing ancient allocation matrix

--- a/libcelt/modes.c

+++ b/libcelt/modes.c

@@ -43,28 +43,10 @@

 #include "quant_bands.h"

 static const celt_int16 eband5ms[] = {

+/*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 */

   0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100

 };

-#if 0

-

-#define BITALLOC_SIZE 9

-/* Bit allocation table in units of 1/32 bit/sample (0.1875 dB SNR) */

-static const unsigned char band_allocation[] = {

-/*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 */

-  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,

- 95, 90, 80, 75, 65, 60, 55, 50, 44, 40, 35, 30, 15,  1,  0,  0,  0,  0,  0,  0,  0,

-100, 95, 90, 88, 85, 82, 78, 74, 70, 65, 60, 54, 45, 35, 25, 15,  1,  0,  0,  0,  0,

-120,110,110,110,100, 96, 90, 88, 84, 76, 70, 65, 60, 45, 35, 25, 20,  1,  1,  0,  0,

-135,125,125,125,115,112,104,104,100, 96, 83, 78, 70, 55, 46, 36, 32, 28, 20,  8,  0,

-170,165,157,155,149,145,143,138,138,138,129,124,108, 96, 88, 83, 72, 56, 44, 28,  2,

-192,192,160,160,160,160,160,160,160,160,150,140,120,110,100, 90, 80, 70, 60, 50, 20,

-224,224,192,192,192,192,192,192,192,160,160,160,160,160,160,160,160,120, 80, 64, 40,

-255,255,224,224,224,224,224,224,224,192,192,192,192,192,192,192,192,192,192,192,120,

-};

-

-#else

-

 /* Alternate tuning (partially derived from Vorbis) */

 #define BITALLOC_SIZE 11

 /* Bit allocation table in units of 1/32 bit/sample (0.1875 dB SNR) */

@@ -82,7 +64,6 @@

 172,165,158,152,143,137,131,125,118,112,106,100, 94, 87, 81, 75, 69, 63, 56, 45, 20,

 200,200,200,200,200,200,200,200,198,193,188,183,178,173,168,163,158,153,148,129,104,

 };

-#endif

 #ifndef CUSTOM_MODES_ONLY

  #ifdef FIXED_POINT

@@ -203,11 +184,6 @@

       celt_assert(eBands[i+1]-eBands[i]<=2*(eBands[i]-eBands[i-1]));

    }

-   /*for (i=0;i<=*nbEBands+1;i++)

-      printf ("%d ", eBands[i]);

-   printf ("\n");

-   exit(1);*/

-   /* FIXME: Remove last band if too small */

    return eBands;

 }