--- trunk/xvidcore/src/bitstream/bitstream.c	2002/03/08 19:17:46	4
+++ trunk/xvidcore/src/bitstream/bitstream.c	2002/04/25 06:55:00	136
@@ -40,7 +40,9 @@
  /******************************************************************************
   *																			   *	
   *  Revision history:                                                         *
-  *                                                                            *
+  *																			   *	
+  *  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									   *
@@ -54,8 +56,11 @@
 #include "zigzag.h"
 #include "../quant/quant_matrix.h"
 
+
 static int __inline log2bin(int value)
 {
+/* Changed by Chenm001 */
+#ifndef WIN32
 	int n = 0;
 	while (value)
 	{
@@ -63,6 +68,12 @@
 		n++;
 	}
 	return n;
+#else
+	__asm{
+		bsr eax,value
+		inc eax
+	}
+#endif
 }
 
 
@@ -282,12 +293,10 @@
 					}
 
 				}
-			
-				if (BitstreamGetBit(bs))				// interlaced
+
+				if ((dec->interlacing = BitstreamGetBit(bs)))
 				{
-					DEBUG("TODO: interlaced");
-					// TODO
-					return -1;
+					DEBUG("vol: interlacing");
 				}
 
 				if (!BitstreamGetBit(bs))				// obmc_disable
@@ -333,17 +342,21 @@
 				{
 					if (BitstreamGetBit(bs))		// load_intra_quant_mat
 					{
-						uint8_t *matrix;
+						uint8_t matrix[64];
 						bs_get_matrix(bs, matrix);
 						set_intra_matrix(matrix);
 					}
+					else
+						set_intra_matrix(get_default_intra_matrix());
 
 					if (BitstreamGetBit(bs))		// load_inter_quant_mat
 					{
-						uint8_t *matrix; 
+						uint8_t matrix[64]; 
 						bs_get_matrix(bs, matrix);
 						set_inter_matrix(matrix);
 					}
+					else
+						set_inter_matrix(get_default_inter_matrix());
 
 					if (dec->shape == VIDOBJLAY_SHAPE_GRAYSCALE)
 					{
@@ -513,11 +526,17 @@
 				// intra_dc_vlc_threshold
 				*intra_dc_threshold = intra_dc_threshold_table[ BitstreamGetBits(bs,3) ];
 
-				/* if (interlaced)
+				if (dec->interlacing)
+				{
+					if ((dec->top_field_first = BitstreamGetBit(bs)))
 					{
-						BitstreamSkip(bs, 1);		// top_field_first
-						BitstreamSkip(bs, 1);		// alternative_vertical_scan_flag
-				*/
+						DEBUG("vop: top_field_first");
+					}
+					if ((dec->alternate_vertical_scan = BitstreamGetBit(bs)))
+					{
+						DEBUG("vop: alternate_vertical_scan");
+					}
+				}
 			}
 						
 			*quant = BitstreamGetBits(bs, dec->quant_bits);		// vop_quant
@@ -580,9 +599,7 @@
 	write vol header
 */
 void BitstreamWriteVolHeader(Bitstream * const bs,
-						const int width,
-						const int height,
-						const int quant_type)
+						const MBParam * pParam,  const FRAMEINFO * frame)
 {
 	// video object_start_code & vo_id
     BitstreamPad(bs);
@@ -618,20 +635,20 @@
 	// BitstreamPutBits(bs, 0, 15);
 
 	WRITE_MARKER();
-	BitstreamPutBits(bs, width, 13);		// width
+	BitstreamPutBits(bs, pParam->width, 13);		// width
 	WRITE_MARKER();
-	BitstreamPutBits(bs, height, 13);		// height
+	BitstreamPutBits(bs, pParam->height, 13);		// height
 	WRITE_MARKER();
 	
-	BitstreamPutBit(bs, 0);		// interlace
+	BitstreamPutBit(bs, frame->global_flags & XVID_INTERLACING);		// interlace
 	BitstreamPutBit(bs, 1);		// obmc_disable (overlapped block motion compensation)
 	BitstreamPutBit(bs, 0);		// sprite_enable
 	BitstreamPutBit(bs, 0);		// not_in_bit
 
 	// quant_type   0=h.263  1=mpeg4(quantizer tables)
-	BitstreamPutBit(bs, quant_type);
+	BitstreamPutBit(bs, pParam->m_quant_type);
 	
-	if (quant_type)
+	if (pParam->m_quant_type)
 	{
 		BitstreamPutBit(bs, get_intra_matrix_status());	// load_intra_quant_mat
 		if (get_intra_matrix_status())
@@ -663,15 +680,13 @@
   (decoder uses these values to determine precise time since last resync)
 */
 void BitstreamWriteVopHeader(Bitstream * const bs,
-			  VOP_TYPE prediction_type,
-			  const int rounding_type,
-			  const uint32_t quant,
-			  const uint32_t fcode)
+						const MBParam * pParam,  
+						const FRAMEINFO * frame)
 {
     BitstreamPad(bs);
     BitstreamPutBits(bs, VOP_START_CODE, 32);
 
-    BitstreamPutBits(bs, prediction_type, 2);
+    BitstreamPutBits(bs, frame->coding_type, 2);
     
 	// time_base = 0  write n x PutBit(1), PutBit(0)
 	BitstreamPutBits(bs, 0, 1);
@@ -685,13 +700,19 @@
 
 	BitstreamPutBits(bs, 1, 1);				// vop_coded
 
-	if (prediction_type != I_VOP)
-		BitstreamPutBits(bs, rounding_type, 1);
+	if (frame->coding_type != I_VOP)
+		BitstreamPutBits(bs, frame->rounding_type, 1);
     
 	BitstreamPutBits(bs, 0, 3);				// intra_dc_vlc_threshold
 
- 	BitstreamPutBits(bs, quant, 5);			// quantizer
+	if (frame->global_flags & XVID_INTERLACING)
+	{
+		BitstreamPutBit(bs, 1);		// top field first
+		BitstreamPutBit(bs, 0);		// alternate vertical scan
+	}
+
+ 	BitstreamPutBits(bs, frame->quant, 5);			// quantizer
 	
-	if (prediction_type != I_VOP)
-		BitstreamPutBits(bs, fcode, 3);		// fixed_code = [1,4]
+	if (frame->coding_type != I_VOP)
+		BitstreamPutBits(bs, frame->fcode, 3);		// fixed_code = [1,4]
 }