[xiph-commits] r18723 - trunk/rhea/src/com/meviatronic/zeus/pollux

[mike at svn.xiph.org]

Author: mike
Date: 2012-11-24 15:04:38 -0800 (Sat, 24 Nov 2012)
New Revision: 18723

Modified:
   trunk/rhea/src/com/meviatronic/zeus/pollux/README.txt
   trunk/rhea/src/com/meviatronic/zeus/pollux/TheoraDecoder.java
   trunk/rhea/src/com/meviatronic/zeus/pollux/VideoReader.java
Log:
2 Bugfixes and one description bugfix

Modified: trunk/rhea/src/com/meviatronic/zeus/pollux/README.txt
===================================================================
--- trunk/rhea/src/com/meviatronic/zeus/pollux/README.txt	2012-11-24 08:27:29 UTC (rev 18722)
+++ trunk/rhea/src/com/meviatronic/zeus/pollux/README.txt	2012-11-24 23:04:38 UTC (rev 18723)
@@ -11,7 +11,7 @@
 	Features of Pollux's enhanced IDCT:
 	- inplacing.
  	- higher degree of content adaptive calculation.
- 	  Dr. m. m. Timothy B. Terriberry pointed out, that this approach is only helpful in case
+ 	  Timothy B. Terriberry, Ph.D. pointed out, that this approach is only helpful in case
  	  of systems and compilers, which don't have or exploit
  	  the SIMD (Single Instruction Multiple Data) computer architecture.
  	
@@ -91,3 +91,4 @@
  	
  	Very thanks to Timothy B. Terriberry, Ph.D. for reviewing and error correcting
  	the README and Pollux decoder.
+

Modified: trunk/rhea/src/com/meviatronic/zeus/pollux/TheoraDecoder.java
===================================================================
--- trunk/rhea/src/com/meviatronic/zeus/pollux/TheoraDecoder.java	2012-11-24 08:27:29 UTC (rev 18722)
+++ trunk/rhea/src/com/meviatronic/zeus/pollux/TheoraDecoder.java	2012-11-24 23:04:38 UTC (rev 18723)
@@ -948,15 +948,16 @@
 							}
 						}
 					
-						mVectsChroma1PointerArray = mVectsPointer[4];
-					
 						if (chromaFormat == CHROMA420) {
+							mVectsChroma1PointerArray = mVectsPointer[4];
+							
 							sum = sumABx + sumCDx;
 							mVectsChroma1PointerArray[0] = (byte) ((sum + (sum < 0 ? -2 : 2)) / 4);
 
 							sum = sumABy + sumCDy;
 							mVectsChroma1PointerArray[1] = (byte) ((sum + (sum < 0 ? -2 : 2)) / 4);
 						} else if (chromaFormat == CHROMA422) {
+							mVectsChroma1PointerArray = mVectsPointer[4];
 							mVectsChroma2PointerArray = mVectsPointer[5];
 				
 							mVectsChroma1PointerArray[0] = (byte) ((sumABx + (sumABx < 0 ? -1 : 1)) / 2);

Modified: trunk/rhea/src/com/meviatronic/zeus/pollux/VideoReader.java
===================================================================
--- trunk/rhea/src/com/meviatronic/zeus/pollux/VideoReader.java	2012-11-24 08:27:29 UTC (rev 18722)
+++ trunk/rhea/src/com/meviatronic/zeus/pollux/VideoReader.java	2012-11-24 23:04:38 UTC (rev 18723)
@@ -369,7 +369,8 @@
 		short[] bmsPointer = bms[bmi];
 		short[] bmsPointer1 = bms[bmj];
 		
-		for (ci = 0, qmin = 16; ci < 64; ci++) {
+		for (ci = 0; ci < 64; ci++) {
+			qmin = 16;
 			bmci = (2 * (qiEnd - qi) * bmsPointer[ci] + 2 * (qi - qiStart) * bmsPointer1[ci] + qrSizesValue) / (2 * qrSizesValue);
 			if (ci > 0 && qti == 0) {
 				qmin = 8;