[xiph-commits] r17144 - in trunk/cronus/src/com/meviatronic/zeus: castor pollux

[mike at svn.xiph.org]

Author: mike
Date: 2010-04-12 12:45:06 -0700 (Mon, 12 Apr 2010)
New Revision: 17144

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


Modified: trunk/cronus/src/com/meviatronic/zeus/castor/AudioReader.java
===================================================================
--- trunk/cronus/src/com/meviatronic/zeus/castor/AudioReader.java	2010-04-12 19:43:56 UTC (rev 17143)
+++ trunk/cronus/src/com/meviatronic/zeus/castor/AudioReader.java	2010-04-12 19:45:06 UTC (rev 17144)
@@ -1037,10 +1037,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/cronus/src/com/meviatronic/zeus/pollux/Output.java
===================================================================
--- trunk/cronus/src/com/meviatronic/zeus/pollux/Output.java	2010-04-12 19:43:56 UTC (rev 17143)
+++ trunk/cronus/src/com/meviatronic/zeus/pollux/Output.java	2010-04-12 19:45:06 UTC (rev 17144)
@@ -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/cronus/src/com/meviatronic/zeus/pollux/VideoReader.java
===================================================================
--- trunk/cronus/src/com/meviatronic/zeus/pollux/VideoReader.java	2010-04-12 19:43:56 UTC (rev 17143)
+++ trunk/cronus/src/com/meviatronic/zeus/pollux/VideoReader.java	2010-04-12 19:45:06 UTC (rev 17144)
@@ -404,7 +404,7 @@
 
 		loadPacket(op.packetBase, op.packet, op.bytes);
 	
-        byte[] buffer = new byte[6];
+		byte[] buffer = new byte[6];
 		
 		int packetType = get(8);
 		
@@ -418,17 +418,17 @@
 	    
 		if (packetType == 0x80 && op.bos != 0) {
 			if(headerInitialized1) {
-          		return;
-        	}
+				return;
+			}
 			verifyFirstPacket();
 		} else if (packetType == 0x81 && op.bos == 0) {
 			if(headerInitialized2) {
-          		return;
-        	}
+				return;
+			}
 			verifySecondPacket();
 		} else if (packetType == 0x82 && op.bos == 0) {
 			if(headerInitialized3) {
-          		return;
+				return;
         	}
 			verifyThirdPacket();
 		} else {
@@ -659,10 +659,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;
 		}
 	}