[xiph-commits] r17143 - in trunk/rhea/src/com/meviatronic/zeus: castor pollux

[mike at svn.xiph.org]

Author: mike
Date: 2010-04-12 12:43:56 -0700 (Mon, 12 Apr 2010)
New Revision: 17143

Modified:
   trunk/rhea/src/com/meviatronic/zeus/castor/AudioReader.java
   trunk/rhea/src/com/meviatronic/zeus/pollux/Output.java
   trunk/rhea/src/com/meviatronic/zeus/pollux/VideoReader.java
Log:


Modified: trunk/rhea/src/com/meviatronic/zeus/castor/AudioReader.java
===================================================================
--- trunk/rhea/src/com/meviatronic/zeus/castor/AudioReader.java	2010-04-12 18:00:41 UTC (rev 17142)
+++ trunk/rhea/src/com/meviatronic/zeus/castor/AudioReader.java	2010-04-12 19:43:56 UTC (rev 17143)
@@ -996,10 +996,8 @@
 		if (node.dereferenced) {
 			node.child = null;
 			node = null;
-		} else {
-			if (node.child != node.childFeed) {
-				node.child = null;
-			}
+		} else if (node.child != node.childFeed) {
+			node.child = null;
 		}
 	}
 	

Modified: trunk/rhea/src/com/meviatronic/zeus/pollux/Output.java
===================================================================
--- trunk/rhea/src/com/meviatronic/zeus/pollux/Output.java	2010-04-12 18:00:41 UTC (rev 17142)
+++ trunk/rhea/src/com/meviatronic/zeus/pollux/Output.java	2010-04-12 19:43:56 UTC (rev 17143)
@@ -172,7 +172,7 @@
 		
 		for (j = pixelOffset; j < pixelRegion; j += 4) {
 	  		lum = Y[py[yCnt]];
-      		u = pu[uvCnt];
+			u = pu[uvCnt];
 			v = pv[uvCnt];
 			r = rU[u];
 			g = rgU[u] + bgV[v];
@@ -217,7 +217,7 @@
 		
 		for (j = pixelOffset; j < pixelRegion; j += 4) {
 	  		lum = Y[py[yCnt]];
-      		u = pu[uvCnt];
+			u = pu[uvCnt];
 			v = pv[uvCnt];
 			r = rU[u];
 			g = rgU[u] + bgV[v];
@@ -269,7 +269,7 @@
 		
 		for (j = pixelOffset; j < pixelRegion; j += 4) {
 	  		lum = Y[py[yCnt]];
-      		u = pu[uvCnt];
+			u = pu[uvCnt];
 			v = pv[uvCnt];
 			r = rU[u];
 			g = rgU[u] + bgV[v];

Modified: trunk/rhea/src/com/meviatronic/zeus/pollux/VideoReader.java
===================================================================
--- trunk/rhea/src/com/meviatronic/zeus/pollux/VideoReader.java	2010-04-12 18:00:41 UTC (rev 17142)
+++ trunk/rhea/src/com/meviatronic/zeus/pollux/VideoReader.java	2010-04-12 19:43:56 UTC (rev 17143)
@@ -395,7 +395,7 @@
 
 		loadPacket(op.packetBase, op.packet, op.bytes);
 	
-        byte[] buffer = new byte[6];
+		byte[] buffer = new byte[6];
 		
 		int packetType = get(8);
 		
@@ -668,10 +668,8 @@
 		if (node.dereferenced) {
 			node.child = null;
 			node = null;
-		} else {
-			if (node.child != node.childFeed) {
-				node.child = null;
-			}
+		} else if (node.child != node.childFeed) {
+			node.child = null;
 		}
 	}