--- bitstream.h	2002/06/30 10:46:29	1.10
+++ bitstream.h	2003/01/11 14:59:24	1.10.2.5
@@ -59,6 +59,8 @@
 
 // comment any #defs we dont use
 
+/* start codes */
+
 #define VIDOBJ_START_CODE		0x00000100	/* ..0x0000011f  */
 #define VIDOBJLAY_START_CODE	0x00000120	/* ..0x0000012f */
 #define VISOBJSEQ_START_CODE	0x000001b0
@@ -67,8 +69,8 @@
 #define GRPOFVOP_START_CODE		0x000001b3
 //#define VIDSESERR_ERROR_CODE  0x000001b4
 #define VISOBJ_START_CODE		0x000001b5
-//#define SLICE_START_CODE      0x000001b7
-//#define EXT_START_CODE        0x000001b8
+#define VOP_START_CODE			0x000001b6
+//#define STUFFING_START_CODE	0x000001c3
 
 
 #define VISOBJ_TYPE_VIDEO				1
@@ -82,6 +84,15 @@
 //#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE    2
 #define VIDOBJLAY_TYPE_CORE				3
 #define VIDOBJLAY_TYPE_MAIN				4
+//#define VIDOBJLAY_TYPE_NBIT				5
+//#define VIDOBJLAY_TYPE_ANIM_TEXT			6
+//#define VIDOBJLAY_TYPE_ANIM_MESH			7
+//#define VIDOBJLAY_TYPE_SIMPLE_FACE		8
+//#define VIDOBJLAY_TYPE_STILL_SCALABLE		9
+#define VIDOBJLAY_TYPE_ART_SIMPLE		10
+//#define VIDOBJLAY_TYPE_CORE_SCALABLE		11
+#define VIDOBJLAY_TYPE_ACE				12
+//#define VIDOBJLAY_TYPE_SIMPLE_FBA			13
 
 
 //#define VIDOBJLAY_AR_SQUARE           1
@@ -97,9 +108,12 @@
 #define VIDOBJLAY_SHAPE_BINARY_ONLY		2
 #define VIDOBJLAY_SHAPE_GRAYSCALE		3
 
-#define VO_START_CODE	0x8
-#define VOL_START_CODE	0x12
-#define VOP_START_CODE	0x1b6
+
+#define SPRITE_NONE		0
+#define SPRITE_STATIC	1
+#define SPRITE_GMC		2
+
+
 
 #define READ_MARKER()	BitstreamSkip(bs, 1)
 #define WRITE_MARKER()	BitstreamPutBit(bs, 1)
@@ -117,27 +131,34 @@
 #define RESYNC_MARKER 1
 
 
-int
-read_video_packet_header(Bitstream *bs, const int addbits, int * quant);
+int read_video_packet_header(Bitstream *bs, 
+						DECODER * dec, 
+						const int addbits, 
+						int * quant, 
+						int * fcode_forward,
+						int  * fcode_backward,
+						int * intra_dc_threshold);
 
 
 // header stuff
 int BitstreamReadHeaders(Bitstream * bs,
 						 DECODER * dec,
 						 uint32_t * rounding,
+						 uint32_t * reduced_resolution,
 						 uint32_t * quant,
 						 uint32_t * fcode_forward,
 						 uint32_t * fcode_backward,
-						 uint32_t * intra_dc_threshold);
+						 uint32_t * intra_dc_threshold,
+						 WARPPOINTS * gmc_warp);
 
 
 void BitstreamWriteVolHeader(Bitstream * const bs,
 							 const MBParam * pParam,
-							 const FRAMEINFO * frame);
+							 const FRAMEINFO * const frame);
 
 void BitstreamWriteVopHeader(Bitstream * const bs,
 							 const MBParam * pParam,
-							 const FRAMEINFO * frame,
+							 const FRAMEINFO * const frame,
 							 int vop_coded);
 
 void BitstreamWriteUserData(Bitstream * const bs, 
@@ -337,19 +358,6 @@
 }
 
 
-/* pad bitstream to the next byte boundary */
-
-static void __inline
-BitstreamPad(Bitstream * const bs)
-{
-	uint32_t remainder = bs->pos % 8;
-
-	if (remainder) {
-		BitstreamForward(bs, 8 - remainder);
-	}
-}
-
-
 /* read n bits from bitstream */
 
 static uint32_t __inline
@@ -412,4 +420,42 @@
 	}
 }
 
+
+static const int stuffing_codes[8] =
+{
+	        /* nbits     stuffing code */
+	0,		/* 1          0 */
+	1,		/* 2          01 */
+	3,		/* 3          011 */
+	7,		/* 4          0111 */
+	0xf,	/* 5          01111 */
+	0x1f,	/* 6          011111 */
+	0x3f,   /* 7          0111111 */
+	0x7f,	/* 8          01111111 */
+};
+
+/* pad bitstream to the next byte boundary */
+
+static void __inline
+BitstreamPad(Bitstream * const bs)
+{
+	int bits = 8 - (bs->pos % 8);
+	if (bits < 8)
+	{
+		BitstreamPutBits(bs, stuffing_codes[bits - 1], bits);
+	}
+}
+
+
+/* pad bitstream to the next byte boundary 
+   alway pad: even if currently at the byte boundary */
+
+static void __inline
+BitstreamPadAlways(Bitstream * const bs)
+{
+	int bits = 8 - (bs->pos % 8);
+	BitstreamPutBits(bs, stuffing_codes[bits - 1], bits);
+}
+
+
 #endif							/* _BITSTREAM_H_ */