sync to latest liba52 release (0.7.4)

CVS patchset: 2543
CVS date: 2002/08/28 20:27:56

1 files changed, 17 insertions, 20 deletions

diff --git a/src/liba52/bitstream.h b/src/liba52/bitstream.h
index be15907e9..7d7ea7679 100644
--- a/src/liba52/bitstream.h
+++ b/src/liba52/bitstream.h
@@ -1,8 +1,10 @@
 /*
  * bitstream.h
- * Copyright (C) 1999-2001 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
+ * Copyright (C) 2000-2002 Michel Lespinasse <walken@zoy.org>
+ * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
  *
  * This file is part of a52dec, a free ATSC A-52 stream decoder.
+ * See http://liba52.sourceforge.net/ for updates.
  *
  * a52dec is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +28,7 @@
 
 #else
 
-#	if defined (__i386__) && defined(__GNUC__)
+#	if 0 && defined (__i386__)
 
 #	define swab32(x) __i386_swab32(x)
 	static inline const uint32_t __i386_swab32(uint32_t x)
@@ -44,37 +46,32 @@
 #	endif
 #endif
 
-extern uint32_t bits_left;
-extern uint32_t current_word;
+void a52_bitstream_set_ptr (a52_state_t * state, uint8_t * buf);
+uint32_t a52_bitstream_get_bh (a52_state_t * state, uint32_t num_bits);
+int32_t a52_bitstream_get_bh_2 (a52_state_t * state, uint32_t num_bits);
 
-void bitstream_set_ptr (uint8_t * buf);
-uint32_t bitstream_get_bh(uint32_t num_bits);
-int32_t bitstream_get_bh_2(uint32_t num_bits);
-
-static inline uint32_t 
-bitstream_get(uint32_t num_bits)
+static inline uint32_t bitstream_get (a52_state_t * state, uint32_t num_bits)
 {
     uint32_t result;
 	
-    if(num_bits < bits_left) {
-	result = (current_word << (32 - bits_left)) >> (32 - num_bits);
-	bits_left -= num_bits;
+    if (num_bits < state->bits_left) {
+	result = (state->current_word << (32 - state->bits_left)) >> (32 - num_bits);
+	state->bits_left -= num_bits;
 	return result;
     }
 
-    return bitstream_get_bh(num_bits);
+    return a52_bitstream_get_bh (state, num_bits);
 }
 
-static inline int32_t 
-bitstream_get_2(uint32_t num_bits)
+static inline int32_t bitstream_get_2 (a52_state_t * state, uint32_t num_bits)
 {
     int32_t result;
 	
-    if(num_bits < bits_left) {
-	result = (((int32_t)current_word) << (32 - bits_left)) >> (32 - num_bits);
-	bits_left -= num_bits;
+    if (num_bits < state->bits_left) {
+	result = (((int32_t)state->current_word) << (32 - state->bits_left)) >> (32 - num_bits);
+	state->bits_left -= num_bits;
 	return result;
     }
 
-    return bitstream_get_bh_2(num_bits);
+    return a52_bitstream_get_bh_2 (state, num_bits);
 }