[xiph-commits] r13153 - trunk/vorbis/lib

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2007-06-20 17:51:15 -0700 (Wed, 20 Jun 2007)
New Revision: 13153

Modified:
   trunk/vorbis/lib/res0.c
Log:
If you're going to guard against max blocksize, make sure you choose the right blocksize.



Modified: trunk/vorbis/lib/res0.c
===================================================================
--- trunk/vorbis/lib/res0.c	2007-06-21 00:47:55 UTC (rev 13152)
+++ trunk/vorbis/lib/res0.c	2007-06-21 00:51:15 UTC (rev 13153)
@@ -375,7 +375,7 @@
   /* move all this setup out later */
   int samples_per_partition=info->grouping;
   int possible_partitions=info->partitions;
-  int end=(info->end<vb->pcmend?info->end:vb->pcmend);
+  int end=(info->end<vb->pcmend/2?info->end:vb->pcmend/2);
   int n=end-info->begin;
   
   if(n>0){
@@ -446,7 +446,7 @@
   /* move all this setup out later */
   int samples_per_partition=info->grouping;
   int possible_partitions=info->partitions;
-  int end=(info->end<vb->pcmend?info->end:vb->pcmend);
+  int end=(info->end<vb->pcmend/2?info->end:vb->pcmend/2);
   int n=end-info->begin;
 
   if(n>0){
@@ -512,7 +512,7 @@
   int samples_per_partition=info->grouping;
   int possible_partitions=info->partitions;
   int partitions_per_word=look->phrasebook->dim;
-  int end=(info->end<vb->pcmend?info->end:vb->pcmend);
+  int end=(info->end<vb->pcmend/2?info->end:vb->pcmend/2);
   int n=end-info->begin;
 
   if(n>0){
@@ -628,7 +628,7 @@
   /* move all this setup out later */
   int samples_per_partition=info->grouping;
   int partitions_per_word=look->phrasebook->dim;
-  int end=(info->end<vb->pcmend?info->end:vb->pcmend);
+  int end=(info->end<vb->pcmend/2?info->end:vb->pcmend/2);
   int n=end-info->begin;
   
   if(n>0){
@@ -847,7 +847,7 @@
   /* move all this setup out later */
   int samples_per_partition=info->grouping;
   int partitions_per_word=look->phrasebook->dim;
-  int end=(info->end<vb->pcmend?info->end:vb->pcmend);
+  int end=(info->end<vb->pcmend/2?info->end:vb->pcmend/2);
   int n=end-info->begin;
 
   if(n>0){