From fa50d3ac349ea62db082898febd0a0fbe90dc1dc Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Tue, 14 Dec 2010 15:02:21 -0500
Subject: [PATCH] More negative bits prevention

---
 libcelt/rate.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/libcelt/rate.c b/libcelt/rate.c
index 434c0b0f..57454849 100644
--- a/libcelt/rate.c
+++ b/libcelt/rate.c
@@ -207,11 +207,17 @@ static inline int interp_bits2pulses(const CELTMode *m, int start, int end,
    }
    for (i=0;i<*skip;i++)
    {
-      if (bits[codedBands-1] >= C<<BITRES)
+      int alloc_floor;
+      if (C==2)
+         alloc_floor = 4<<BITRES; /* Fine energy plus intensity stereo */
+      else
+         alloc_floor = 1<<BITRES;
+      if (bits[codedBands-1] >= alloc_floor)
+      {
+         psum = psum - bits[codedBands-1] + alloc_floor;
+         bits[codedBands-1] = alloc_floor;
+      } else if (bits[codedBands-1] < C<<BITRES)
       {
-         psum = psum - bits[codedBands-1] + ((C+1)<<BITRES);
-         bits[codedBands-1] = C<<BITRES;
-      } else {
          psum = psum - bits[codedBands-1];
          bits[codedBands-1] = 0;
       }