diff options
author | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2009-11-22 07:41:26 +0300 |
---|---|---|
committer | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2009-11-22 07:41:26 +0300 |
commit | e05e7e23bb62495670cbd6d73957cbde3f0db1d0 (patch) | |
tree | a1f37dcc47aa5ee1478197f96a3726f869e58622 | |
parent | 6d584acd95ef267fd89da8e869577fa524b88354 (diff) |
minor code cleanup
-rw-r--r-- | libcelt/celt.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/libcelt/celt.c b/libcelt/celt.c index a7079d7..782c6c3 100644 --- a/libcelt/celt.c +++ b/libcelt/celt.c @@ -108,10 +108,6 @@ struct CELTEncoder { celt_sig xmem; celt_word16 *oldBandE; -#ifdef EXP_PSY - celt_word16 *psy_mem; - struct PsyDecay psy; -#endif }; static int check_encoder(const CELTEncoder *st) @@ -194,15 +190,7 @@ CELTEncoder *celt_encoder_create(const CELTMode *mode, int channels, int *error) st->preemph_memE = (celt_word16*)celt_alloc(C*sizeof(celt_word16)); st->preemph_memD = (celt_sig*)celt_alloc(C*sizeof(celt_sig)); -#ifdef EXP_PSY - st->psy_mem = celt_alloc(MAX_PERIOD*sizeof(celt_word16)); - psydecay_init(&st->psy, MAX_PERIOD/2, st->mode->Fs); -#endif - if ((st->in_mem!=NULL) && (st->out_mem!=NULL) && (st->oldBandE!=NULL) -#ifdef EXP_PSY - && (st->psy_mem!=NULL) -#endif && (st->preemph_memE!=NULL) && (st->preemph_memD!=NULL)) { if (error) @@ -248,11 +236,7 @@ void celt_encoder_destroy(CELTEncoder *st) celt_free(st->preemph_memE); celt_free(st->preemph_memD); - -#ifdef EXP_PSY - celt_free (st->psy_mem); - psydecay_clear(&st->psy); -#endif + st->marker = ENCODERFREED; celt_free(st); |