 
 // 20/24-bit <-> 32-bit helper routines (not really matrixing but convenient to put here)
 
-void copy20ToPredictor( uint8_t * in, uint32_t stride, int32_t * out, int32_t numSamples )
+void copy20ToPredictor(uint8_t * in, uint32_t stride, int32_t * out, int32_t numSamples)
 {
 	uint8_t *	ip = in;
 	int32_t			j;
 
-	for ( j = 0; j < numSamples; j++ )
+	for (j = 0; j < numSamples; j++)
 	{
 		int32_t			val;
 
 		// 20-bit values are left-aligned in the 24-bit input buffer but right-aligned in the 32-bit output buffer
-		val = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
+		val = (int32_t)(((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE]);
 		out[j] = (val << 8) >> 12;
 		ip += stride * 3;
 	}
 }
 
-void copy24ToPredictor( uint8_t * in, uint32_t stride, int32_t * out, int32_t numSamples )
+void copy24ToPredictor(uint8_t * in, uint32_t stride, int32_t * out, int32_t numSamples)
 {
 	uint8_t *	ip = in;
 	int32_t			j;
 
-	for ( j = 0; j < numSamples; j++ )
+	for (j = 0; j < numSamples; j++)
 	{
 		int32_t			val;
 
-		val = (int32_t)( ((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE] );
+		val = (int32_t)(((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE]);
 		out[j] = (val << 8) >> 8;
 		ip += stride * 3;
 	}

	}
	else
	{
		if ( bytesShifted == 0 )
		{
			/* de-interleaving w/o shift */
			for ( j = 0; j < numSamples; j++ )
			{
				u[j] = ip[0];
				v[j] = ip[1];

		}
		else
		{
			for (j = 0; j < numSamples; j++)
			{
				l = (int32_t)(((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE]);
				l = (l << 8) >> 8;
				ip += 3;

				r = (int32_t)(((uint32_t)ip[HBYTE] << 16) | ((uint32_t)ip[MBYTE] << 8) | (uint32_t)ip[LBYTE]);
				r = (r << 8) >> 8;
				ip += (stride - 1) * 3;

