[xiph-commits] r14052 - trunk/theora/lib/enc

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2007-10-26 07:31:57 -0700 (Fri, 26 Oct 2007)
New Revision: 14052

Modified:
   trunk/theora/lib/enc/encoder_toplevel.c
Log:
Revert quant base matricies to mainline values; committing the change 
was an 'oopsie'.



Modified: trunk/theora/lib/enc/encoder_toplevel.c
===================================================================
--- trunk/theora/lib/enc/encoder_toplevel.c	2007-10-26 14:28:55 UTC (rev 14051)
+++ trunk/theora/lib/enc/encoder_toplevel.c	2007-10-26 14:31:57 UTC (rev 14052)
@@ -41,26 +41,26 @@
 /*The default quantization parameters used by VP3.1.*/
 static const int OC_VP31_RANGE_SIZES[1]={63};
 static const th_quant_base OC_VP31_BASES_INTRA_Y[2]={
-  { 
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
+  {
+     16, 11, 10, 16, 24,  40, 51, 61,
+     12, 12, 14, 19, 26,  58, 60, 55,
+     14, 13, 16, 24, 40,  57, 69, 56,
+     14, 17, 22, 29, 51,  87, 80, 62,
+     18, 22, 37, 58, 68, 109,103, 77,
+     24, 35, 55, 64, 81, 104,113, 92,
+     49, 64, 78, 87,103, 121,120,101,
+     72, 92, 95, 98,112, 100,103, 99
   },
-  { 
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-  },
+  {
+     16, 11, 10, 16, 24,  40, 51, 61,
+     12, 12, 14, 19, 26,  58, 60, 55,
+     14, 13, 16, 24, 40,  57, 69, 56,
+     14, 17, 22, 29, 51,  87, 80, 62,
+     18, 22, 37, 58, 68, 109,103, 77,
+     24, 35, 55, 64, 81, 104,113, 92,
+     49, 64, 78, 87,103, 121,120,101,
+     72, 92, 95, 98,112, 100,103, 99
+  }
 };
 static const th_quant_base OC_VP31_BASES_INTRA_C[2]={
   {
@@ -85,28 +85,26 @@
   }
 };
 static const th_quant_base OC_VP31_BASES_INTER[2]={
-  { 
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
+  {
+     16, 16, 16, 20, 24, 28, 32, 40,
+     16, 16, 20, 24, 28, 32, 40, 48,
+     16, 20, 24, 28, 32, 40, 48, 64,
+     20, 24, 28, 32, 40, 48, 64, 64,
+     24, 28, 32, 40, 48, 64, 64, 64,
+     28, 32, 40, 48, 64, 64, 64, 96,
+     32, 40, 48, 64, 64, 64, 96,128,
+     40, 48, 64, 64, 64, 96,128,128
   },
-  { 
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-    10,10,10,10,10,10,10,10,
-  },
-
-  
+  {
+     16, 16, 16, 20, 24, 28, 32, 40,
+     16, 16, 20, 24, 28, 32, 40, 48,
+     16, 20, 24, 28, 32, 40, 48, 64,
+     20, 24, 28, 32, 40, 48, 64, 64,
+     24, 28, 32, 40, 48, 64, 64, 64,
+     28, 32, 40, 48, 64, 64, 64, 96,
+     32, 40, 48, 64, 64, 64, 96,128,
+     40, 48, 64, 64, 64, 96,128,128
+  }
 };
 
 const th_quant_info TH_VP31_QUANT_INFO={