shithub: opus

Info  •  Files  •  Log  •  Branches

In CVBR mode the rate selection was failing to add bytes which were about to fall off the end of the bitres and never be reusable, causing undershoot.

--- a/libcelt/celt.c

+++ b/libcelt/celt.c

@@ -1163,11 +1163,9 @@

      min_allowed = (tell+total_boost+(1<<BITRES+3)-1>>(BITRES+3)) + 2 - nbFilledBytes;

      nbAvailableBytes = target+(1<<(BITRES+2))>>(BITRES+3);

-     nbAvailableBytes=IMAX(min_allowed,nbAvailableBytes);

+     nbAvailableBytes = IMAX(min_allowed,nbAvailableBytes);

+     nbAvailableBytes = IMIN(nbCompressedBytes,nbAvailableBytes+nbFilledBytes) - nbFilledBytes;

-     nbCompressedBytes = IMIN(nbCompressedBytes,nbAvailableBytes+nbFilledBytes);

-     nbAvailableBytes = nbCompressedBytes - nbFilledBytes;

-

      target=nbAvailableBytes<<(BITRES+3);

      if (st->vbr_count < 970)

@@ -1194,6 +1192,7 @@

         st->vbr_reservoir = 0;

         /*printf ("+%d\n", adjust);*/

      }

+     nbCompressedBytes = IMIN(nbCompressedBytes,nbAvailableBytes+nbFilledBytes);

      /* This moves the raw bits to take into account the new compressed size */

      ec_byte_shrink(&buf, nbCompressedBytes);