Last updates for draft -11v0.9.9

- Draft updates
- Updated code to produce and check test vectors
- Making sure that the test vectors pass at all rates as well as for mono and stereo

2 files changed, 5 insertions, 5 deletions

diff --git a/celt/bands.c b/celt/bands.c
index 1d49386c..68b36261 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -238,22 +238,22 @@ void anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collapse_mas
          celt_norm *X;
          opus_val16 prev1;
          opus_val16 prev2;
-         opus_val16 Ediff;
+         opus_val32 Ediff;
          opus_val16 r;
          int renormalize=0;
          prev1 = prev1logE[c*m->nbEBands+i];
          prev2 = prev2logE[c*m->nbEBands+i];
-         if (C<CC)
+         if (C==1)
          {
             prev1 = MAX16(prev1,prev1logE[m->nbEBands+i]);
             prev2 = MAX16(prev2,prev2logE[m->nbEBands+i]);
          }
-         Ediff = logE[c*m->nbEBands+i]-MIN16(prev1,prev2);
+         Ediff = EXTEND32(logE[c*m->nbEBands+i])-EXTEND32(MIN16(prev1,prev2));
          Ediff = MAX16(0, Ediff);
 
 #ifdef FIXED_POINT
          if (Ediff < 16384)
-            r = 2*MIN16(16383,SHR32(celt_exp2(-Ediff),1));
+            r = 2*MIN16(16383,SHR32(celt_exp2(-EXTRACT16(Ediff)),1));
          else
             r = 0;
          if (LM==3)
diff --git a/celt/celt.c b/celt/celt.c
index 6c1eb6b8..ddf65fad 100644
--- a/celt/celt.c
+++ b/celt/celt.c
@@ -2392,7 +2392,7 @@ int celt_decode_with_ec(CELTDecoder * restrict st, const unsigned char *data, in
       dec = &_dec;
    }
 
-   if (C<CC)
+   if (C==1)
    {
       for (i=0;i<st->mode->nbEBands;i++)
          oldBandE[i]=MAX16(oldBandE[i],oldBandE[st->mode->nbEBands+i]);