Update to opus-HEAD-66611f1.

celt/rate.c

 /* Copyright (c) 2007-2008 CSIRO
    Copyright (c) 2007-2009 Xiph.Org Foundation
    Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
 
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
@@ skipping 315 matching lines @@
           we just signaled should be cocentrated in this band. */
       if (j<=skip_start)
       {
          /* Give the bit we reserved to end skipping back. */
          total += skip_rsv;
          break;
       }
       /*Figure out how many left-over bits we would be adding to this band.
         This can include bits we've stolen back from higher, skipped bands.*/
       left = total-psum;
-      percoeff = left/(m->eBands[codedBands]-m->eBands[start]);
+      percoeff = celt_udiv(left, m->eBands[codedBands]-m->eBands[start]);
       left -= (m->eBands[codedBands]-m->eBands[start])*percoeff;
       rem = IMAX(left-(m->eBands[j]-m->eBands[start]),0);
       band_width = m->eBands[codedBands]-m->eBands[j];
       band_bits = (int)(bits[j] + percoeff*band_width + rem);
       /*Only code a skip decision if we're above the threshold for this band.
         Otherwise it is force-skipped.
         This ensures that we have enough bits to code the skip flag.*/
       if (band_bits >= IMAX(thresh[j], alloc_floor+(1<<BITRES)))
       {
          if (encode)
@@ skipping 60 matching lines @@
       if (encode)
          ec_enc_bit_logp(ec, *dual_stereo, 1);
       else
          *dual_stereo = ec_dec_bit_logp(ec, 1);
    }
    else
       *dual_stereo = 0;
 
    /* Allocate the remaining bits */
    left = total-psum;
-   percoeff = left/(m->eBands[codedBands]-m->eBands[start]);
+   percoeff = celt_udiv(left, m->eBands[codedBands]-m->eBands[start]);
    left -= (m->eBands[codedBands]-m->eBands[start])*percoeff;
    for (j=start;j<codedBands;j++)
       bits[j] += ((int)percoeff*(m->eBands[j+1]-m->eBands[j]));
    for (j=start;j<codedBands;j++)
    {
       int tmp = (int)IMIN(left, m->eBands[j+1]-m->eBands[j]);
       bits[j] += tmp;
       left -= tmp;
    }
    /*for (j=0;j<end;j++)printf("%d ", bits[j]);printf("\n");*/
@@ skipping 30 matching lines @@
             offset += den<<BITRES>>2;
 
          /* Changing the offset for allocating the second and third
              fine energy bit */
          if (bits[j] + offset < den*2<<BITRES)
             offset += NClogN>>2;
          else if (bits[j] + offset < den*3<<BITRES)
             offset += NClogN>>3;
 
          /* Divide with rounding */
-         ebits[j] = IMAX(0, (bits[j] + offset + (den<<(BITRES-1))) / (den<<BITRES));
+         ebits[j] = IMAX(0, (bits[j] + offset + (den<<(BITRES-1))));
+         ebits[j] = celt_udiv(ebits[j], den)>>BITRES;
 
          /* Make sure not to bust */
          if (C*ebits[j] > (bits[j]>>BITRES))
             ebits[j] = bits[j] >> stereo >> BITRES;
 
          /* More than that is useless because that's about as far as PVQ can go */
          ebits[j] = IMIN(ebits[j], MAX_FINE_BITS);
 
          /* If we rounded down or capped this band, make it a candidate for the
              final fine energy pass */
@@ skipping 150 matching lines @@
       bits1[j] = bits1j;
       bits2[j] = bits2j;
    }
    codedBands = interp_bits2pulses(m, start, end, skip_start, bits1, bits2, thresh, cap,
          total, balance, skip_rsv, intensity, intensity_rsv, dual_stereo, dual_stereo_rsv,
          pulses, ebits, fine_priority, C, LM, ec, encode, prev, signalBandwidth);
    RESTORE_STACK;
    return codedBands;
 }