actually getting the synthesis

3 files changed, 2 insertions, 8 deletions

diff --git a/celt/bands.c b/celt/bands.c
index 5b5561e3..35afed8f 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -1006,9 +1006,7 @@ static unsigned quant_partition(struct band_ctx *ctx, celt_norm *X,
          if (encode)
          {
             cm = alg_quant(X, N, K, spread, B, ec
-#ifdef RESYNTH
                  , gain
-#endif
                  );
          } else {
             cm = alg_unquant(X, N, K, spread, B, ec, gain);
@@ -1547,6 +1545,8 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
                x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
                      effective_lowband != -1 ? norm+effective_lowband : NULL, LM,
                      last?NULL:norm+M*eBands[i]-norm_offset, lowband_scratch, cm);
+               /* Restore rounding mode (is it needed?) */
+               ctx.theta_round = 0;
             } else {
                ctx.theta_round = 0;
                x_cm = quant_band_stereo(&ctx, X, Y, N, b, B,
diff --git a/celt/vq.c b/celt/vq.c
index d29f38fd..1b38e8db 100644
--- a/celt/vq.c
+++ b/celt/vq.c
@@ -159,9 +159,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, ec_enc *enc
-#ifdef RESYNTH
    , opus_val16 gain
-#endif
    )
 {
    VARDECL(celt_norm, y);
@@ -314,10 +312,8 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B, ec_enc *enc
    } while (++j<N);
    encode_pulses(iy, N, K, enc);
 
-#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;
diff --git a/celt/vq.h b/celt/vq.h
index 5cfcbe50..484ff2af 100644
--- a/celt/vq.h
+++ b/celt/vq.h
@@ -53,9 +53,7 @@
 */
 unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B,
       ec_enc *enc
-#ifdef RESYNTH
       , opus_val16 gain
-#endif
       );
 
 /** Algebraic pulse decoder