[xiph-cvs] cvs commit: vorbis/lib mapping0.c res0.c

[Monty]

xiphmont    01/10/22 02:09:31

  Modified:    lib      Tag: branch_monty_20011009 mapping0.c res0.c
  Log:
  Found one straggler that was killing bitrate tracking at even
  iteration boundaries

Revision  Changes    Path
No                   revision

No                   revision

1.37.2.6  +6 -6      vorbis/lib/mapping0.c

Index: mapping0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/mapping0.c,v
retrieving revision 1.37.2.5
retrieving revision 1.37.2.6
diff -u -r1.37.2.5 -r1.37.2.6
--- mapping0.c	2001/10/20 03:00:10	1.37.2.5
+++ mapping0.c	2001/10/22 09:09:29	1.37.2.6
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.37.2.5 2001/10/20 03:00:10 xiphmont Exp $
+ last mod: $Id: mapping0.c,v 1.37.2.6 2001/10/22 09:09:29 xiphmont Exp $
 
  ********************************************************************/
 
@@ -651,15 +651,15 @@
                     qbundle[j],sobundle[j],zerobundle[j],chbundle[j],
                     i,classifications[j],b->bitrate_avgfloat,queueptr);
         }
-	i++;
-
       }
-
+      i++;
+	
+      
       /* bitrate management.... deciding when it's time to stop. */
       if(i<quant_passes){
         if(b->bitrate_bins==0){ /* average bitrate always runs
-                                      encode to the bitter end in
-                                      order to collect statistics */
+				   encode to the bitter end in
+				   order to collect statistics */
           
           long current_bytes=oggpack_bits(&vb->opb)/8;
           

1.37.2.6  +3 -8      vorbis/lib/res0.c

Index: res0.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/res0.c,v
retrieving revision 1.37.2.5
retrieving revision 1.37.2.6
diff -u -r1.37.2.5 -r1.37.2.6
--- res0.c	2001/10/20 01:03:59	1.37.2.5
+++ res0.c	2001/10/22 09:09:29	1.37.2.6
@@ -11,7 +11,7 @@
  ********************************************************************
 
  function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.37.2.5 2001/10/20 01:03:59 xiphmont Exp $
+ last mod: $Id: res0.c,v 1.37.2.6 2001/10/22 09:09:29 xiphmont Exp $
 
  ********************************************************************/
 
@@ -511,13 +511,8 @@
   }
 #endif      
 
-  if((int)passlimit<ci->passlimit[pass]){
-    wholepasses=passlimit;
-    partialpass=rint((passlimit-wholepasses)*partvals);
-  }else{
-    wholepasses=ci->passlimit[pass];
-    partialpass=0;
-  }
+  wholepasses=passlimit;
+  partialpass=(passlimit-wholepasses)*partvals;
 
   memset(resbits,0,sizeof(resbits));
   memset(resvals,0,sizeof(resvals));

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.