eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-03 00:57:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove model markers

Browse source
This commit is contained in:
Jean-Marc Valin 2010-08-27 16:15:20 -04:00
parent bce1dd0d75
commit f9950e0624
3 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcelt/dump_modes.c
View file

@ -197,7 +197,6 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
/* Print the actual mode data */
fprintf(file, "static const CELTMode mode%d_%d_%d = {\n", mode->Fs, mdctSize, mode->overlap);
fprintf(file, "0x%x,\t/* marker */\n", 0xa110ca7e);
fprintf(file, INT32 ",\t/* Fs */\n", mode->Fs);
fprintf(file, "%d,\t/* overlap */\n", mode->overlap);
fprintf(file, "%d,\t/* nbEBands */\n", mode->nbEBands);
@ -223,7 +222,6 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
fprintf(file, "logN%d_%d,\t/* logN */\n", mode->Fs, mdctSize);
fprintf(file, "{%d, cache_index%d_%d, cache_bits%d_%d},\t/* cache */\n",
mode->cache.size, mode->Fs, mdctSize, mode->Fs, mdctSize);
fprintf(file, "0x%x,\t/* marker */\n", 0xa110ca7e);
fprintf(file, "};\n");
}
fprintf(file, "\n");

20
libcelt/modes.c
View file

@ -46,10 +46,6 @@
#include "static_modes.c"
#endif
#define MODEVALID 0xa110ca7e
#define MODEPARTIAL 0x7eca10a1
#define MODEFREED 0xb10cf8ee
#ifndef M_PI
#define M_PI 3.141592653
#endif
@ -311,7 +307,6 @@ CELTMode *celt_mode_create(celt_int32 Fs, int frame_size, int *error)
mode = celt_alloc(sizeof(CELTMode));
if (mode==NULL)
goto failure;
mode->marker_start = MODEPARTIAL;
mode->Fs = Fs;
/* Pre/de-emphasis depends on sampling rate. The "standard" pre-emphasis
@ -415,8 +410,6 @@ CELTMode *celt_mode_create(celt_int32 Fs, int frame_size, int *error)
mode->prob = quant_prob_alloc(mode);
if (mode->prob==NULL)
goto failure;
mode->marker_start = MODEVALID;
mode->marker_end = MODEVALID;
if (error)
*error = CELT_OK;
@ -440,18 +433,6 @@ void celt_mode_destroy(CELTMode *mode)
return;
}
if (mode->marker_start == MODEFREED || mode->marker_end == MODEFREED)
{
celt_warning("Freeing a mode which has already been freed");
return;
}
if (mode->marker_start != MODEVALID && mode->marker_start != MODEPARTIAL)
{
celt_warning("This is not a valid CELT mode structure");
return;
}
mode->marker_start = MODEFREED;
celt_free((celt_int16*)mode->eBands);
celt_free((celt_int16*)mode->allocVectors);
@ -463,7 +444,6 @@ void celt_mode_destroy(CELTMode *mode)
clt_mdct_clear(&mode->mdct);
quant_prob_free(mode->prob);
mode->marker_end = MODEFREED;
celt_free((CELTMode *)mode);
#endif
}

2
libcelt/modes.h
View file

@ -77,7 +77,6 @@ typedef struct {
@brief Mode definition
*/
struct CELTMode {
celt_uint32 marker_start;
celt_int32 Fs;
int overlap;
@ -102,7 +101,6 @@ struct CELTMode {
const celt_int16 *logN;
PulseCache cache;
celt_uint32 marker_end;
};
/* Prototypes for _ec versions of the encoder/decoder calls (not public) */