--- portab.h	2002/03/28 12:24:41	1.8
+++ portab.h	2002/04/07 11:57:47	1.14
@@ -5,6 +5,8 @@
 
 #include <windows.h>
 
+#define DEBUGCBR(A,B,C) { char tmp[100]; wsprintf(tmp, "CBR: frame: %i, quant: %i, deviation: %i\n", (A), (B), (C)); OutputDebugString(tmp); }
+
 #ifdef _DEBUG
 #define DEBUG(S) OutputDebugString((S));
 #define DEBUG1(S,I) { char tmp[100]; wsprintf(tmp, "%s %i\n", (S), (I)); OutputDebugString(tmp); }
@@ -32,10 +34,14 @@
 #define EMMS() __asm {emms}
 
 #define CACHE_LINE  16
+
 #if _MSC_VER <= 1200
-#define CACHE_ALIGN
+#define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+	type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
+	type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1))
 #else
-#define CACHE_ALIGN __declspec(align(CACHE_LINE))
+#define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+	__declspec(align(alignment)) type name[(sizex)*(sizey)]
 #endif
 
 // needed for bitstream.h
@@ -59,22 +65,23 @@
 
 #elif defined(LINUX) || defined(DJGPP)
 
-
 #ifdef _DEBUG
 
 #include <stdio.h>
-#define DEBUG_WHERE		stdout
-#define DEBUG(S)        fprintf(DEBUG_WHERE, "%s\n", (S));
-#define DEBUG1(S,I)     fprintf(DEBUG_WHERE, "%s %i\n", (S), (I))
-#define DEBUG2(S,A,B)   fprintf(DEBUG_WHERE, "%s%i=%i\n", (S), (A), (B))
-#define DEBUG3(S,A,B,C) fprintf(DEBUG_WHERE, "%s %i %x %x\n", (S), (A), (B), (C))
+#define DEBUG_WHERE               stdout
+#define DEBUG(S)                  fprintf(DEBUG_WHERE, "%s\n", (S));
+#define DEBUG1(S,I)               fprintf(DEBUG_WHERE, "%s %i\n", (S), (I))
+#define DEBUG2(S,A,B)             fprintf(DEBUG_WHERE, "%s%i=%i\n", (S), (A), (B))
+#define DEBUG3(S,A,B,C)           fprintf(DEBUG_WHERE, "%s %i %x %x\n", (S), (A), (B), (C))
 #define DEBUG8(S,A,B,C,D,E,F,G,H)
+#define DEBUGCBR(A,B,C)           fprintf(DEBUG_WHERE, "CBR: frame: %i, quant: %i, deviation: %i\n", (A), (B), (C))
 #else
 #define DEBUG(S)
 #define DEBUG1(S,I)
 #define DEBUG2(X,A,B)
 #define DEBUG3(X,A,B,C)
 #define DEBUG8(X,A,B,C,D,E,F,G,H)
+#define DEBUGCBR(A,B,C)
 #endif
 
 #define CACHE_LINE  16
@@ -85,19 +92,20 @@
 
 #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
 	type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
-	typedef type  name##_sub[sizey]; \
-	name##_sub * name = (void *) (((int32_t) name##_storage+(alignment)) & ~((int32_t)(alignment)-1))
+	type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1))
 
 #else
 
-#define CACHE_ALIGN __attribute__ ((__aligned__(CACHE_LINE)))
-#define int8_t char
-#define uint8_t unsigned char
-#define int16_t short
+#define #define #define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
+	__attribute__ ((__aligned__(CACHE_LINE))) type name[(sizex)*(sizey)]
+
+#define int8_t   char
+#define uint8_t  unsigned char
+#define int16_t  short
 #define uint16_t unsigned short
-#define int32_t int
+#define int32_t  int
 #define uint32_t unsigned int
-#define int64_t long long
+#define int64_t  long long
 #define uint64_t unsigned long long
 
 #endif
@@ -105,13 +113,32 @@
 
 // needed for bitstream.h
 #ifdef ARCH_PPC
-	#define BSWAP(a) __asm__ ( "lwbrx %0,0,%1; eieio" : "=r" (a) : \
+	#define BSWAP(a) __asm__ __volatile__ ( "lwbrx %0,0,%1; eieio" : "=r" (a) : \
 		"r" (&(a)), "m" (a));
 	#define EMMS()
+
+	static __inline unsigned long get_tbl(void) {
+		unsigned long tbl;
+		asm volatile("mftb %0" : "=r" (tbl));
+		return tbl;
+	}
+	static __inline unsigned long get_tbu(void) {
+		unsigned long tbl;
+		asm volatile("mftbu %0" : "=r" (tbl));
+		return tbl;
+	}
+	static __inline int64_t read_counter() {
+		unsigned long tb, tu;
+		do {
+			tu = get_tbu();
+			tb = get_tbl();
+		} while(tb != get_tbl());
+		return (((int64_t)tu) << 32) | (int64_t)tb;
+	}
 #else
 	#define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
 	#define EMMS() __asm__("emms\n\t")
-#endif
+
 
 // needed for timer.c
 static __inline int64_t read_counter() {
@@ -125,6 +152,8 @@
     return ts;
 }
 
+#endif
+
 #else // OTHER OS
 
 #define DEBUG(S)
@@ -132,6 +161,7 @@
 #define DEBUG2(X,A,B)
 #define DEBUG3(X,A,B,C)
 #define DEBUG8(X,A,B,C,D,E,F,G,H)
+#define DEBUGCBR(A,B,C)
 
 #include <inttypes.h>