diff options
| -rw-r--r-- | libcelt/celt.h | 1 | ||||
| -rw-r--r-- | libcelt/modes.c | 45 | ||||
| -rw-r--r-- | libcelt/quant_bands.c | 1 | ||||
| -rw-r--r-- | libcelt/testcelt.c | 6 |
4 files changed, 51 insertions, 2 deletions
diff --git a/libcelt/celt.h b/libcelt/celt.h index bd366ea..8c78929 100644 --- a/libcelt/celt.h +++ b/libcelt/celt.h @@ -55,6 +55,7 @@ typedef struct CELTMode CELTMode; extern const CELTMode *celt_mono; extern const CELTMode *celt_stereo; +extern const CELTMode *celt_ld51; /* Encoder stuff */ diff --git a/libcelt/modes.c b/libcelt/modes.c index 2ad27b8..bb74cef 100644 --- a/libcelt/modes.c +++ b/libcelt/modes.c @@ -147,6 +147,51 @@ const CELTMode const *celt_mono = &mono_mode; const CELTMode const *celt_stereo = &stereo_mode; +#define NBANDS51 17 +#define PBANDS51 8 +#define PITCH_END51 64 +const int qbank51[NBANDS51 +2] = {0, 4, 8, 12, 16, 20, 24, 28, 32, 38, 44, 52, 64, 78, 96,122,156,204, 256}; +const int qbank51b[NBANDS +2] = {0, 3, 6, 9, 12, 16, 20, 24, 28, 32, 38, 44, 52, 64, 78, 96,122,156,204, 256}; + +const int pbank51[PBANDS51 +2] = {0, 4, 8, 12, 16, 24, 32, 44, PITCH_END51, 256}; +const int pbank51b[PBANDS +2] = {0, 3, 6, 9, 12, 20, 38, 52, PITCH_END51, 256}; +#define NALLOCS51 10 +int bitalloc51[NBANDS51*NALLOCS51] = + { 6, 5, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 7, 6, 5, 4, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, + 8, 7, 6, 5, 4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, + 9, 8, 7, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, + 10, 9, 8, 8, 7, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, + 10, 9, 9, 8, 8, 8, 8, 8, 8, 8, 9, 10, 11, 10, 10, 5, 5, + 16, 15, 14, 14, 14, 13, 13, 13, 13, 13, 15, 16, 17, 18, 20, 18, 11, + 26, 25, 24, 22, 20, 18, 19, 19, 25, 22, 25, 30, 30, 35, 35, 35, 35, + 32, 30, 28, 27, 25, 24, 23, 21, 29, 27, 35, 40, 42, 50, 59, 54, 51, + 42, 40, 38, 37, 35, 34, 33, 31, 39, 37, 45, 50, 52, 60, 60, 60, 60, + }; + +static const CELTMode ld51 = { + 128, /**< overlap */ + 256, /**< mdctSize */ + 1, /**< nbMdctBlocks */ + 1, /**< channels */ + + NBANDS51, /**< nbEBands */ + PBANDS51, /**< nbPBands */ + PITCH_END51, /**< pitchEnd */ + + qbank51, /**< eBands */ + pbank51, /**< pBands*/ + 0, /**< nbPulses */ + + 0.8, /**< ePredCoef */ + means18, /**< eMeans */ + decay18, /**< eDecay */ + + NALLOCS51, /**< nbAllocVectors */ + bitalloc51, /**< allocVectors */ +}; +const CELTMode const *celt_ld51 = &ld51; + int celt_mode_info(const CELTMode *mode, int request, celt_int32_t *value) { switch (request) diff --git a/libcelt/quant_bands.c b/libcelt/quant_bands.c index 5ad7a9c..81e35e2 100644 --- a/libcelt/quant_bands.c +++ b/libcelt/quant_bands.c @@ -37,6 +37,7 @@ const float eMeans[24] = {45.f, -8.f, -12.f, -2.5f, 1.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f}; +//const int frac[24] = {4, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}; const int frac[24] = {8, 6, 5, 4, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}; static void quant_energy_mono(const CELTMode *m, float *eBands, float *oldEBands, int budget, ec_enc *enc) diff --git a/libcelt/testcelt.c b/libcelt/testcelt.c index 4e1f18e..f780769 100644 --- a/libcelt/testcelt.c +++ b/libcelt/testcelt.c @@ -61,15 +61,17 @@ int main(int argc, char *argv[]) mode = celt_mono; else if (strcmp(argv[1], "-stereo")==0) mode = celt_stereo; + else if (strcmp(argv[1], "-ld51")==0) + mode = celt_ld51; else { fprintf (stderr, "mode must be -mono or -stereo\n"); return 1; } bytes_per_packet = atoi(argv[2]); - if (bytes_per_packet < 12 || bytes_per_packet > 120) + if (bytes_per_packet < 0 || bytes_per_packet > 120) { - fprintf (stderr, "bytes per packet must be between 15 and 120\n"); + fprintf (stderr, "bytes per packet must be between 10 and 120\n"); return 1; } inFile = argv[3]; |