--- trunk/xvidcore/src/bitstream/bitstream.c	2005/11/22 10:23:01	1653
+++ trunk/xvidcore/src/bitstream/bitstream.c	2019/01/17 14:19:40	2169
@@ -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.55 2005-11-22 10:23:01 suxen_drol Exp $
+ * $Id$
  *
  ****************************************************************************/
 
@@ -129,7 +129,7 @@
 		}
 	}
 
-	mbnum = BitstreamGetBits(bs, mbnum_bits);		/* macroblock_number */
+	mbnum = (mbnum_bits == 0) ? 0 : BitstreamGetBits(bs, mbnum_bits);		/* macroblock_number */
 	DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum);
 
 	if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY)
@@ -423,18 +423,17 @@
 			DPRINTF(XVID_DEBUG_STARTCODE, "</visual_object_sequence>\n");
 
 		} else if (start_code == VISOBJ_START_CODE) {
-			int visobj_ver_id;
 
 			DPRINTF(XVID_DEBUG_STARTCODE, "<visual_object>\n");
 
 			BitstreamSkip(bs, 32);	/* visual_object_start_code */
 			if (BitstreamGetBit(bs))	/* is_visual_object_identified */
 			{
-				visobj_ver_id = BitstreamGetBits(bs, 4);	/* visual_object_ver_id */
-				DPRINTF(XVID_DEBUG_HEADER,"visobj_ver_id %i\n", visobj_ver_id);
+				dec->ver_id = BitstreamGetBits(bs, 4);	/* visual_object_ver_id */
+				DPRINTF(XVID_DEBUG_HEADER,"visobj_ver_id %i\n", dec->ver_id);
 				BitstreamSkip(bs, 3);	/* visual_object_priority */
 			} else {
-				visobj_ver_id = 1;
+				dec->ver_id = 1;
 			}
 
 			if (BitstreamShowBits(bs, 4) != VISOBJ_TYPE_VIDEO)	/* visual_object_type */
@@ -483,7 +482,7 @@
 				DPRINTF(XVID_DEBUG_HEADER,"ver_id %i\n", vol_ver_id);
 				BitstreamSkip(bs, 3);	/* video_object_layer_priority */
 			} else {
-				vol_ver_id = 1;
+				vol_ver_id = dec->ver_id;
 			}
 
 			dec->aspect_ratio = BitstreamGetBits(bs, 4);
@@ -816,11 +815,12 @@
 				dec->time_base += time_incr;
 				dec->time = dec->time_base*dec->time_inc_resolution + time_increment;
 				dec->time_pp = (int32_t)(dec->time - dec->last_non_b_time);
-				dec->last_non_b_time = dec->time;
+                dec->last_non_b_time = dec->time;
 			} else {
-				dec->time = (dec->last_time_base + time_incr)*dec->time_inc_resolution + time_increment;
+                dec->time = (dec->last_time_base + time_incr)*dec->time_inc_resolution + time_increment;
 				dec->time_bp = dec->time_pp - (int32_t)(dec->last_non_b_time - dec->time);
 			}
+            if (dec->time_pp <= 0) dec->time_pp = 1;
 			DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", dec->time_pp);
 			DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", dec->time_bp);
 
@@ -860,8 +860,9 @@
 				dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&
 				(coding_type == P_VOP || coding_type == I_VOP)) {
 
-				if (BitstreamGetBit(bs));
+				if (BitstreamGetBit(bs)) {
 					DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");
+				}
 			}
 
 			if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {
@@ -1024,6 +1025,11 @@
 						version, build, dec->packed_mode);
 			}
 
+			if ((dec->bs_version == 0) && (build > 0) &&
+				(build != 1393)) { /* non-xvid stream with xvid fourcc */
+				dec->bs_version = 0xffff;
+			}
+
 		} else					/* start_code == ? */
 		{
 			if (BitstreamShowBits(bs, 24) == 0x000001) {
@@ -1067,7 +1073,8 @@
 void
 BitstreamWriteVolHeader(Bitstream * const bs,
 						const MBParam * pParam,
-						const FRAMEINFO * const frame)
+						const FRAMEINFO * const frame,
+						const int num_slices)
 {
 	static const unsigned int vo_id = 0;
 	static const unsigned int vol_id = 0;
@@ -1232,7 +1239,12 @@
 	}
 
 	BitstreamPutBit(bs, 1);		/* complexity_estimation_disable */
-	BitstreamPutBit(bs, 1);		/* resync_marker_disable */
+
+	if (num_slices > 1)
+		BitstreamPutBit(bs, 0);		/* resync_marker_enabled */
+	else
+		BitstreamPutBit(bs, 1);		/* resync_marker_disabled */
+
 	BitstreamPutBit(bs, 0);		/* data_partitioned */
 
 	if (vol_ver_id != 1) {
@@ -1247,7 +1259,7 @@
 	/* divx5 userdata string */
 #define DIVX5_ID ((char *)"DivX503b1393")
   if ((pParam->global_flags & XVID_GLOBAL_DIVX5_USERDATA)) {
-    BitstreamWriteUserData(bs, DIVX5_ID, strlen(DIVX5_ID));
+    BitstreamWriteUserData(bs, DIVX5_ID, (uint32_t)strlen(DIVX5_ID));
   	if (pParam->max_bframes > 0 && (pParam->global_flags & XVID_GLOBAL_PACKED))
       BitstreamPutBits(bs, 'p', 8);
 	}
@@ -1260,7 +1272,7 @@
 				xvid_user_format,
 				XVID_BS_VERSION,
 				(frame->vop_flags & XVID_VOP_CARTOON)?'C':'\0');
-		BitstreamWriteUserData(bs, xvid_user_data, strlen(xvid_user_data));
+		BitstreamWriteUserData(bs, xvid_user_data, (uint32_t)strlen(xvid_user_data));
 	}
 }
 
@@ -1381,7 +1393,7 @@
 						const char *data,
 						const unsigned int length)
 {
-	int i;
+	unsigned int i;
 
 	BitstreamPad(bs);
 	BitstreamPutBits(bs, USERDATA_START_CODE, 32);
@@ -1441,12 +1453,11 @@
 
     if (frame->coding_type == I_VOP)
       nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER;  /* 16 zeros followed by a 1. */
-    else if (frame->coding_type == P_VOP)
-      nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER-1 + frame->fcode;
-    else /* B_VOP */
-      nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER, NUMBITS_VP_RESYNC_MARKER-1 + MAX(frame->fcode, frame->bcode));
+    else if (frame->coding_type == B_VOP) /* B_VOP */
+      nbitsresyncmarker = MAX(NUMBITS_VP_RESYNC_MARKER+1, NUMBITS_VP_RESYNC_MARKER + MAX(frame->fcode, frame->bcode) - 1);
+    else /*(frame->coding_type == P_VOP)*/
+		nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + frame->fcode - 1;
 
-    BitstreamPadAlways(bs);
     BitstreamPutBits(bs, RESYNC_MARKER, nbitsresyncmarker);
     BitstreamPutBits(bs, mbnum, mbnum_bits);
     BitstreamPutBits(bs, frame->quant, 5);