--- bitstream.h	2003/06/09 13:51:46	1.17.2.5
+++ bitstream.h	2006/07/10 15:05:30	1.22.2.1
@@ -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.1 2006/07/10 15:05:30 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,31 @@
 
 
 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, 
-							uint8_t * data, 
-							const int length);
+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);
 
 /* initialise bitstream structure */
 
@@ -179,7 +193,12 @@
 #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 = bitpos*8;
 	bs->length = length;
 }
@@ -206,7 +225,12 @@
 #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;
 }
 
@@ -253,7 +277,7 @@
 
 
 /* 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 +464,7 @@
 
 
 /*
- * pad bitstream to the next byte boundary 
+ * pad bitstream to the next byte boundary
  * alway pad: even if currently at the byte boundary
  */