--- bitstream.c	2003/06/09 13:51:34	1.39.2.11
+++ bitstream.c	2003/09/10 19:28:40	1.39.2.17
@@ -20,7 +20,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.c,v 1.39.2.11 2003/06/09 13:51:34 edgomez Exp $
+ * $Id: bitstream.c,v 1.39.2.17 2003/09/10 19:28:40 chl Exp $
  *
  ****************************************************************************/
 
@@ -36,8 +36,6 @@
 static uint32_t __inline
 log2bin(uint32_t value)
 {
-/* Changed by Chenm001 */
-#if !defined(_MSC_VER)
 	int n = 0;
 
 	while (value) {
@@ -45,12 +43,6 @@
 		n++;
 	}
 	return n;
-#else
-	__asm {
-		bsr eax, value 
-		inc eax
-	}
-#endif
 }
 
 
@@ -1022,6 +1014,12 @@
 
 			DPRINTF(XVID_DEBUG_STARTCODE, "<user_data>: %s\n", tmp);
 
+			/* read xvid bitstream version */
+			if(strncmp(tmp, "XviD", 4) == 0) {
+				sscanf(tmp, "XviD%d", &dec->bs_version);
+				DPRINTF(XVID_DEBUG_HEADER, "xvid bitstream version=%i", dec->bs_version);
+			}
+
 		    /* divx detection */
 			i = sscanf(tmp, "DivX%dBuild%d%c", &version, &build, &packed);
 			if (i < 2)
@@ -1081,8 +1079,8 @@
 {
 	static const unsigned int vo_id = 0;
 	static const unsigned int vol_id = 0;
-	int vol_ver_id=1;
-    int vol_type_ind=VIDOBJLAY_TYPE_SIMPLE;
+	int vol_ver_id = 1;
+	int vol_type_ind = VIDOBJLAY_TYPE_SIMPLE;
 
 	if ( (pParam->vol_flags & XVID_VOL_QUARTERPEL) ||  
          (pParam->vol_flags & XVID_VOL_GMC) || 
@@ -1117,10 +1115,13 @@
 	BitstreamPad(bs);
 	BitstreamPutBits(bs, VISOBJ_START_CODE, 32);
 	BitstreamPutBits(bs, 0, 1);		/* is_visual_object_identifier */
+
+	/* Video type */
 	BitstreamPutBits(bs, VISOBJ_TYPE_VIDEO, 4);		/* visual_object_type */
+	BitstreamPutBit(bs, 0); /* video_signal_type */
 	
 	/* video object_start_code & vo_id */
-	BitstreamPad(bs);
+	BitstreamPadAlways(bs); /* next_start_code() */
 	BitstreamPutBits(bs, VIDOBJ_START_CODE|(vo_id&0x5), 32);
 
 	/* video_object_layer_start_code & vol_id */
@@ -1130,18 +1131,20 @@
 	BitstreamPutBit(bs, 0);		/* random_accessible_vol */
 	BitstreamPutBits(bs, vol_type_ind, 8);	/* video_object_type_indication */
 
-	if (vol_ver_id == 1)
-	{
+	if (vol_ver_id == 1) {
 		BitstreamPutBit(bs, 0);				/* is_object_layer_identified (0=not given) */
-	}
-	else
-	{
+	} else {
 		BitstreamPutBit(bs, 1);		/* is_object_layer_identified */
 		BitstreamPutBits(bs, vol_ver_id, 4);	/* vol_ver_id == 2 */
-		BitstreamPutBits(bs, 4, 3); /* vol_ver_priority (1==lowest, 7==highest) ?? */
+		BitstreamPutBits(bs, 4, 3); /* vol_ver_priority (1==highest, 7==lowest) */
 	}
 
-	BitstreamPutBits(bs, 1, 4);	/* aspect_ratio_info (1=1:1) */
+	/* Aspect ratio */
+	BitstreamPutBits(bs, pParam->par, 4); /* aspect_ratio_info (1=1:1) */
+	if(pParam->par == XVID_PAR_EXT) {
+		BitstreamPutBits(bs, pParam->par_width, 8);
+		BitstreamPutBits(bs, pParam->par_height, 8);
+	}
 
 	BitstreamPutBit(bs, 1);	/* vol_control_parameters */
 	BitstreamPutBits(bs, 1, 2);	/* chroma_format 1="4:2:0" */
@@ -1170,7 +1173,7 @@
 
     if (pParam->fincr>0) {
 	    BitstreamPutBit(bs, 1);		/* fixed_vop_rate = 1 */
-	    BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase));	/* fixed_vop_time_increment */
+	    BitstreamPutBits(bs, pParam->fincr, log2bin(pParam->fbase-1));	/* fixed_vop_time_increment */
     }else{
         BitstreamPutBit(bs, 0);		/* fixed_vop_rate = 0 */
     }
@@ -1187,7 +1190,7 @@
 	if (vol_ver_id != 1) 
 	{	if ((pParam->vol_flags & XVID_VOL_GMC))
 		{	BitstreamPutBits(bs, 2, 2);		/* sprite_enable=='GMC' */
-			BitstreamPutBits(bs, 2, 6);		/* no_of_sprite_warping_points */
+			BitstreamPutBits(bs, 3, 6);		/* no_of_sprite_warping_points */
 			BitstreamPutBits(bs, 3, 2);		/* sprite_warping_accuracy 0==1/2, 1=1/4, 2=1/8, 3=1/16 */
 			BitstreamPutBit(bs, 0);			/* sprite_brightness_change (not supported) */
 
@@ -1231,16 +1234,16 @@
 	BitstreamPutBit(bs, 1);		/* resync_marker_disable */
 	BitstreamPutBit(bs, 0);		/* data_partitioned */
 
-	if (vol_ver_id != 1) 
-	{
+	if (vol_ver_id != 1) {
 		BitstreamPutBit(bs, 0);		/* newpred_enable */
-		
 		BitstreamPutBit(bs, (pParam->vol_flags & XVID_VOL_REDUCED_ENABLE)?1:0);	
 									/* reduced_resolution_vop_enabled */
 	}
 	
 	BitstreamPutBit(bs, 0);		/* scalability */
 
+	BitstreamPadAlways(bs); /* next_start_code(); */
+
 	/* fake divx5 id, to ensure compatibility with divx5 decoder */
 #define DIVX5_ID "DivX000b000p"
 	if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED)) {
@@ -1290,7 +1293,7 @@
 
 	/* time_increment: value=nth_of_sec, nbits = log2(resolution) */
 
-	BitstreamPutBits(bs, frame->ticks, log2bin(pParam->fbase));
+	BitstreamPutBits(bs, frame->ticks, log2bin(pParam->fbase-1));
 #if 0
 	DPRINTF("[%i:%i] %c",
 			frame->seconds, frame->ticks,
@@ -1303,6 +1306,14 @@
 
 	if (!vop_coded) {
 		BitstreamPutBits(bs, 0, 1);
+#if 0
+		BitstreamPadAlways(bs); /*  next_start_code() */
+#endif
+		/* NB: It's up to the function caller to write the next_start_code().
+		 * At the moment encoder.c respects that requisite because a VOP
+		 * always ends with a next_start_code either if it's coded or not
+		 * and encoder.c terminates a frame with a next_start_code in whatever
+		 * case */
 		return;
 	}
 
@@ -1324,7 +1335,7 @@
 	if (frame->coding_type == S_VOP) {
 		if (1)	{		/* no_of_sprite_warping_points>=1 (we use 2!) */
 			int k;
-			for (k=0;k<2;k++)
+			for (k=0;k<3;k++)
 			{
 				bs_put_spritetrajectory(bs, frame->warp.duv[k].x ); /* du[k]  */
 				WRITE_MARKER();