shithub: opus

Info  •  Files  •  Log  •  Branches

Fix a case where the new search can leave us with no pulse left

--- a/libcelt/vq.c

+++ b/libcelt/vq.c

@@ -145,9 +145,10 @@

       j=0; do {

          sum += X[j];

       }  while (++j<N);

-      sum = DIV32(SHL32(EXTEND32(K),15),EPSILON+sum);

+      sum = DIV32(SHL32(EXTEND32(K-1),15),EPSILON+sum);

       j=0; do {

 #ifdef FIXED_POINT

+         /* It's really important to round *towards zero* here */

          iy[j] = MULT16_32_Q15(X[j],sum);

 #else

          iy[j] = floor(sum*X[j]);

@@ -160,6 +161,8 @@

          pulsesLeft -= iy[j];

       }  while (++j<N);

    }

+   /*printf ("%d / %d (%d)\n", pulsesLeft, K, N);*/

+   celt_assert2(pulsesLeft>=1, "Allocated too many pulses in the quick pass");

 #endif

    while (pulsesLeft > 1)

    {