eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Skipping transient shape renormalisation in the encoder because

Browse source 
our search can now work on vectors that don't have unit norm
This commit is contained in:
Jean-Marc Valin 2010-04-20 17:31:45 -04:00
parent 281a63eae8
commit d6b79eeb7a
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libcelt/celt.c
View file

@ -529,7 +529,9 @@ void deemphasis(celt_sig *in, celt_word16 *pcm, int N, int _C, celt_word16 coef,
} }
} }
static void mdct_shape(const CELTMode *mode, celt_norm *X, int start, int end, int N, int nbShortMdcts, int mdct_weight_shift, int _C) static void mdct_shape(const CELTMode *mode, celt_norm *X, int start,
int end, int N, int nbShortMdcts,
int mdct_weight_shift, int _C, int renorm)
{ {
int m, i, c; int m, i, c;
const int C = CHANNELS(_C); const int C = CHANNELS(_C);
@ -541,6 +543,7 @@ static void mdct_shape(const CELTMode *mode, celt_norm *X, int start, int end, i
#else #else
X[i] = (1.f/(1<<mdct_weight_shift))*X[i]; X[i] = (1.f/(1<<mdct_weight_shift))*X[i];
#endif #endif
if (renorm)
renormalise_bands(mode, X, C); renormalise_bands(mode, X, C);
} }
@ -754,10 +757,7 @@ int celt_encode_float(CELTEncoder * restrict st, const celt_sig * pcm, celt_sig
} while (m<st->mode->nbShortMdcts-1); } while (m<st->mode->nbShortMdcts-1);
#endif #endif
if (mdct_weight_shift) if (mdct_weight_shift)
{ mdct_shape(st->mode, X, mdct_weight_pos+1, st->mode->nbShortMdcts, N, st->mode->nbShortMdcts, mdct_weight_shift, C, 0);
mdct_shape(st->mode, X, mdct_weight_pos+1, st->mode->nbShortMdcts, N, st->mode->nbShortMdcts, mdct_weight_shift, C);
renormalise_bands(st->mode, X, C);
}
} }
@ -887,7 +887,7 @@ int celt_encode_float(CELTEncoder * restrict st, const celt_sig * pcm, celt_sig
if (mdct_weight_shift) if (mdct_weight_shift)
{ {
mdct_shape(st->mode, X, 0, mdct_weight_pos+1, N, st->mode->nbShortMdcts, mdct_weight_shift, C); mdct_shape(st->mode, X, 0, mdct_weight_pos+1, N, st->mode->nbShortMdcts, mdct_weight_shift, C, 1);
} }
/* Synthesis */ /* Synthesis */
@ -1554,7 +1554,7 @@ int celt_decode_float(CELTDecoder * restrict st, const unsigned char *data, int
if (mdct_weight_shift) if (mdct_weight_shift)
{ {
mdct_shape(st->mode, X, 0, mdct_weight_pos+1, N, st->mode->nbShortMdcts, mdct_weight_shift, C); mdct_shape(st->mode, X, 0, mdct_weight_pos+1, N, st->mode->nbShortMdcts, mdct_weight_shift, C, 1);
} }
/* Synthesis */ /* Synthesis */