[xiph-commits] r13184 - branches/lowmem-branch/Tremor

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2007-06-23 02:17:01 -0700 (Sat, 23 Jun 2007)
New Revision: 13184

Modified:
   branches/lowmem-branch/Tremor/codebook.c
   branches/lowmem-branch/Tremor/floor1.c
   branches/lowmem-branch/Tremor/misc.c
Log:
Increase defult debugging malloc head alignment

One more 'force eop' fix when speculative codebook decode runs off the 
end of a packet 



Modified: branches/lowmem-branch/Tremor/codebook.c
===================================================================
--- branches/lowmem-branch/Tremor/codebook.c	2007-06-23 09:14:45 UTC (rev 13183)
+++ branches/lowmem-branch/Tremor/codebook.c	2007-06-23 09:17:01 UTC (rev 13184)
@@ -191,7 +191,6 @@
   int i;
   ogg_uint32_t *work;
 
-
   if(s->dec_nodeb==4){
     s->dec_table=_ogg_malloc((s->used_entries*2+1)*sizeof(*work));
     /* +1 (rather than -2) is to accommodate 0 and 1 sized books,
@@ -633,7 +632,7 @@
     oggpack_adv(b,i+1);
     return chase;
   }
-  oggpack_adv(b,read);
+  oggpack_adv(b,read+1);
   return(-1);
 }
 

Modified: branches/lowmem-branch/Tremor/floor1.c
===================================================================
--- branches/lowmem-branch/Tremor/floor1.c	2007-06-23 09:14:45 UTC (rev 13183)
+++ branches/lowmem-branch/Tremor/floor1.c	2007-06-23 09:17:01 UTC (rev 13184)
@@ -105,10 +105,9 @@
     info->class[j].class_dim=oggpack_read(opb,3)+1; /* 1 to 8 */
     info->class[j].class_subs=oggpack_read(opb,2); /* 0,1,2,3 bits */
     if(oggpack_eop(opb)<0) goto err_out;
-    if(info->class[j].class_subs){
+    if(info->class[j].class_subs)
       info->class[j].class_book=oggpack_read(opb,8);
-      if(info->class[j].class_book>=ci->books)goto err_out;
-    }else
+    else
       info->class[j].class_book=0;
     if(info->class[j].class_book>=ci->books)goto err_out;
     for(k=0;k<(1<<info->class[j].class_subs);k++){

Modified: branches/lowmem-branch/Tremor/misc.c
===================================================================
--- branches/lowmem-branch/Tremor/misc.c	2007-06-23 09:14:45 UTC (rev 13183)
+++ branches/lowmem-branch/Tremor/misc.c	2007-06-23 09:17:01 UTC (rev 13184)
@@ -10,7 +10,7 @@
  *                                                                  *
  ********************************************************************/
 
-#define HEAD_ALIGN 32
+#define HEAD_ALIGN 64
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>