Avoid passing 'resynth' argument since resynth is either !encode
or it's always 1 if -DRESYNTH.
This commit is contained in:
parent
66c612ef43
commit
d830d08923
5 changed files with 31 additions and 29 deletions
12
libcelt/vq.c
12
libcelt/vq.c
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue