Avoid passing 'resynth' argument since resynth is either !encode

or it's always 1 if -DRESYNTH.
This commit is contained in:
Gregory Maxwell 2011-08-15 16:05:40 -04:00
parent 66c612ef43
commit d830d08923
5 changed files with 31 additions and 29 deletions

View file

@ -167,7 +167,7 @@ static unsigned extract_collapse_mask(int *iy, int N, int B)
}
unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B,
int resynth, ec_enc *enc, opus_val16 gain)
ec_enc *enc, opus_val16 gain)
{
VARDECL(celt_norm, y);
VARDECL(int, iy);
@ -320,11 +320,11 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B,
} while (++j<N);
encode_pulses(iy, N, K, enc);
if (resynth)
{
normalise_residual(iy, X, N, yy, gain);
exp_rotation(X, N, -1, B, K, spread);
}
#ifdef RESYNTH
normalise_residual(iy, X, N, yy, gain);
exp_rotation(X, N, -1, B, K, spread);
#endif
collapse_mask = extract_collapse_mask(iy, N, B);
RESTORE_STACK;
return collapse_mask;