--- bitstream.h	2003/06/09 13:51:46	1.17.2.5
+++ bitstream.h	2006/11/01 09:26:52	1.22.2.2
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: bitstream.h,v 1.17.2.5 2003/06/09 13:51:46 edgomez Exp $
+ * $Id: bitstream.h,v 1.22.2.2 2006/11/01 09:26:52 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -116,10 +116,10 @@
  * Prototypes
  ****************************************************************************/
 
-int read_video_packet_header(Bitstream *bs, 
-							 DECODER * dec, 
-							 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);
@@ -128,7 +128,6 @@
 int BitstreamReadHeaders(Bitstream * bs,
 						 DECODER * dec,
 						 uint32_t * rounding,
-						 uint32_t * reduced_resolution,
 						 uint32_t * quant,
 						 uint32_t * fcode_forward,
 						 uint32_t * fcode_backward,
@@ -137,16 +136,41 @@
 
 
 void BitstreamWriteVolHeader(Bitstream * const bs,
-							 const MBParam * pParam);
+							 const MBParam * pParam,
+							 const FRAMEINFO * const frame);
 
 void BitstreamWriteVopHeader(Bitstream * const bs,
 							 const MBParam * pParam,
 							 const FRAMEINFO * const frame,
-							 int vop_coded);
+							 int vop_coded,
+							 unsigned int quant);
+
+void BitstreamWriteUserData(Bitstream * const bs,
+							const char *data,
+							const unsigned int length);
+
+void
+BitstreamWriteEndOfSequence(Bitstream * const bs);
+
+void
+BitstreamWriteGroupOfVopHeader(Bitstream * const bs,
+                               const MBParam * pParam,
+                               uint32_t is_closed_gov);
+
+void write_video_packet_header(Bitstream * const bs,
+                               const MBParam * pParam,
+                               const FRAMEINFO * const frame,
+                               int mbnum);
+
+/*****************************************************************************
+ * Bitstream
+ ****************************************************************************/
 
-void BitstreamWriteUserData(Bitstream * const bs, 
-							uint8_t * data, 
-							const int length);
+/* Input buffer should be readable as full chunks of 8bytes, including
+the end of the buffer. Padding might be appropriate. If only chunks
+of 4bytes are applicable, define XVID_SAFE_BS_TAIL. Note that this will
+slow decoding, so consider this as a last-resort solution */
+/* #define XVID_SAFE_BS_TAIL */
 
 /* initialise bitstream structure */
 
@@ -179,8 +203,12 @@
 #endif
 	bs->bufb = tmp;
 
-	bs->buf = 0;
 	bs->pos = bs->initpos = bitpos*8;
+	/* preserve the intervening bytes */
+	if (bs->initpos > 0)
+		bs->buf = bs->bufa & (0xffffffff << (32 - bs->initpos));
+	else
+		bs->buf = 0;
 	bs->length = length;
 }
 
@@ -206,7 +234,11 @@
 #endif
 	bs->bufb = tmp;
 
-	bs->buf = 0;
+	/* preserve the intervening bytes */
+	if (bs->initpos > 0)
+		bs->buf = bs->bufa & (0xffffffff << (32 - bs->initpos));
+	else
+		bs->buf = 0;
 	bs->pos = bs->initpos;
 }
 
@@ -241,19 +273,29 @@
 		uint32_t tmp;
 
 		bs->bufa = bs->bufb;
-		tmp = *((uint32_t *) bs->tail + 2);
+#if defined(XVID_SAFE_BS_TAIL)
+		if (bs->tail<(bs->start+((bs->length+3)>>2)))
+#endif
+		{
+			tmp = *((uint32_t *) bs->tail + 2);
 #ifndef ARCH_IS_BIG_ENDIAN
-		BSWAP(tmp);
+			BSWAP(tmp);
+#endif
+			bs->bufb = tmp;
+			bs->tail++;
+		}
+#if defined(XVID_SAFE_BS_TAIL)
+		else {
+			bs->bufb = 0;
+		}
 #endif
-		bs->bufb = tmp;
-		bs->tail++;
 		bs->pos -= 32;
 	}
 }
 
 
 /* number of bits to next byte alignment */
-static __inline uint32_t 
+static __inline uint32_t
 BitstreamNumBitsToByteAlign(Bitstream *bs)
 {
 	uint32_t n = (32 - bs->pos) % 8;
@@ -440,7 +482,7 @@
 
 
 /*
- * pad bitstream to the next byte boundary 
+ * pad bitstream to the next byte boundary
  * alway pad: even if currently at the byte boundary
  */