--- trunk/xvidcore/src/bitstream/bitstream.c	2002/06/14 12:26:06	206
+++ trunk/xvidcore/src/bitstream/bitstream.c	2002/06/20 14:05:58	229
@@ -38,22 +38,25 @@
   ******************************************************************************/
 
  /******************************************************************************
-  *																			   *	
+  *                                                                            *
   *  Revision history:                                                         *
-  *																			   *	
-  *  08.05.2002  add low_delay support for B_VOP decode						   *
+  *                                                                            *
+  *  20.05.2002 added BitstreamWriteUserData                                   *
+  *  19.06.2002  Fix a little bug in use custom quant matrix                   *
+  *              MinChen <chenm001@163.com>                                    *
+  *  08.05.2002  add low_delay support for B_VOP decode                        *
   *              MinChen <chenm001@163.com>                                    *
   *  06.05.2002 low_delay                                                      *
   *  06.05.2002 fixed fincr/fbase error                                        *
   *  01.05.2002 added BVOP support to BitstreamWriteVopHeader                  *
   *  15.04.2002 rewrite log2bin use asm386  By MinChen <chenm001@163.com>      *
-  *  26.03.2002 interlacing support											   *
-  *  03.03.2002 qmatrix writing												   *
-  *  03.03.2002 merged BITREADER and BITWRITER								   *
-  *	 30.02.2002	intra_dc_threshold support									   *
-  *	 04.12.2001	support for additional headers								   *
-  *	 16.12.2001	inital version                                           	   *
-  *																			   *
+  *  26.03.2002 interlacing support                                            *
+  *  03.03.2002 qmatrix writing                                                *
+  *  03.03.2002 merged BITREADER and BITWRITER                                 *
+  *      30.02.2002     intra_dc_threshold support                             *
+  *      04.12.2001     support for additional headers                         *
+  *      16.12.2001     inital version                                         *
+  *
   ******************************************************************************/
 
 
@@ -108,6 +111,7 @@
 		matrix[scan_tables[0][i++]] = value;
 	}
 	while (value != 0 && i < 64);
+        i--;    // fix little bug at coeff not full
 
 	while (i < 64) {
 		matrix[scan_tables[0][i++]] = last;
@@ -613,7 +617,7 @@
 
 #ifdef BFRAMES
 	if (pParam->max_bframes > 0) {
-		dprintf("low_delay=1");
+		DPRINTF("low_delay=1");
 		BitstreamPutBit(bs, 1);	// vol_control_parameters
 		BitstreamPutBits(bs, 1, 2);	// chroma_format 1="4:2:0"
 		BitstreamPutBit(bs, 0);	// low_delay
@@ -693,7 +697,8 @@
 void
 BitstreamWriteVopHeader(Bitstream * const bs,
 						const MBParam * pParam,
-						const FRAMEINFO * frame)
+						const FRAMEINFO * frame,
+						int vop_coded)
 {
 #ifdef BFRAMES
 	uint32_t i;
@@ -718,7 +723,7 @@
 	// time_increment: value=nth_of_sec, nbits = log2(resolution)
 #ifdef BFRAMES
 	BitstreamPutBits(bs, frame->ticks, log2bin(pParam->fbase));
-	dprintf("[%i:%i] %c\n", frame->seconds, frame->ticks,
+	DPRINTF("[%i:%i] %c\n", frame->seconds, frame->ticks,
 			frame->coding_type == I_VOP ? 'I' : frame->coding_type ==
 			P_VOP ? 'P' : 'B');
 #else
@@ -727,6 +732,11 @@
 
 	WRITE_MARKER();
 
+	if (!vop_coded) {
+		BitstreamPutBits(bs, 0, 1);
+		return;
+	}
+
 	BitstreamPutBits(bs, 1, 1);	// vop_coded
 
 	if (frame->coding_type == P_VOP)
@@ -748,3 +758,20 @@
 		BitstreamPutBits(bs, frame->bcode, 3);	// backward_fixed_code
 
 }
+
+
+void 
+BitstreamWriteUserData(Bitstream * const bs, 
+						uint8_t * data, 
+						const int length)
+{
+	int i;
+
+	BitstreamPad(bs);
+	BitstreamPutBits(bs, USERDATA_START_CODE, 32);
+
+	for (i = 0; i < length; i++) {
+		BitstreamPutBits(bs, data[i], 8);
+	}
+
+}
\ No newline at end of file