--- trunk/xvidcore/vfw/src/codec.c	2004/07/11 08:54:38	1487
+++ trunk/xvidcore/vfw/src/codec.c	2004/11/22 10:40:03	1562
@@ -502,6 +502,12 @@
 		pass2.kfthreshold = codec->config.kfthreshold;
 		pass2.container_frame_overhead = 24;	/* AVI */
 
+		/* VBV */
+		pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
+		pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4;
+		pass2.vbv_maxrate = 1000*profiles[codec->config.profile].max_bitrate;
+		pass2.vbv_peakrate = 10000000; /* 10mbps -- fixme */
+
 		plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
 		plugins[create.num_plugins].param = &pass2;
 		create.num_plugins++;
@@ -643,6 +649,8 @@
 }
 
 
+#define CALC_BI_STRIDE(width,bitcount)  ((((width * bitcount) + 31) & ~31) >> 3)
+
 LRESULT compress(CODEC * codec, ICCOMPRESS * icc)
 {
 	BITMAPINFOHEADER * inhdr = icc->lpbiInput;
@@ -740,6 +748,9 @@
 
 	frame.motion |= pmvfast_presets[codec->config.motion_search];
 
+	if (codec->config.vhq_bframe) frame.vop_flags |= XVID_VOP_RD_BVOP;
+
+
 	switch (codec->config.vhq_mode)
 	{
 	case VHQ_MODE_DECISION :
@@ -776,7 +787,7 @@
 	}
 
 	frame.input.plane[0] = icc->lpInput;
-	frame.input.stride[0] = (((icc->lpbiInput->biWidth * icc->lpbiInput->biBitCount) + 31) & ~31) >> 3;
+	frame.input.stride[0] = CALC_BI_STRIDE(icc->lpbiInput->biWidth, icc->lpbiInput->biBitCount);
 
 	if ((frame.input.csp = get_colorspace(inhdr)) == XVID_CSP_NULL)
 		return ICERR_BADFORMAT;
@@ -929,7 +940,8 @@
 	outhdr->biPlanes = 1;
 	outhdr->biBitCount = 24;
 	outhdr->biCompression = BI_RGB;	/* sonic foundry vegas video v3 only supports BI_RGB */
-	outhdr->biSizeImage = outhdr->biWidth * outhdr->biHeight * outhdr->biBitCount / 8;
+	outhdr->biSizeImage = outhdr->biHeight * CALC_BI_STRIDE(outhdr->biWidth, outhdr->biBitCount);
+
 	outhdr->biXPelsPerMeter = 0;
 	outhdr->biYPelsPerMeter = 0;
 	outhdr->biClrUsed = 0;
@@ -1035,13 +1047,13 @@
 
 		convert.input.csp = get_colorspace(icd->lpbiInput);
 		convert.input.plane[0] = icd->lpInput;
-		convert.input.stride[0] = (((icd->lpbiInput->biWidth *icd->lpbiInput->biBitCount) + 31) & ~31) >> 3;  
+		convert.input.stride[0] = CALC_BI_STRIDE(icd->lpbiInput->biWidth, icd->lpbiInput->biBitCount);
 		if (convert.input.csp == XVID_CSP_I420 || convert.input.csp == XVID_CSP_YV12)
 			convert.input.stride[0] = (convert.input.stride[0]*2)/3;
 
 		convert.output.csp = get_colorspace(icd->lpbiOutput);
 		convert.output.plane[0] = icd->lpOutput;
-		convert.output.stride[0] = (((icd->lpbiOutput->biWidth *icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
+		convert.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, icd->lpbiOutput->biBitCount);
 		if (convert.output.csp == XVID_CSP_I420 || convert.output.csp == XVID_CSP_YV12)
 			convert.output.stride[0] = (convert.output.stride[0]*2)/3;
 
@@ -1071,9 +1083,9 @@
 			return ICERR_BADFORMAT;
 		}
 		frame.output.plane[0] = icd->lpOutput;
-		frame.output.stride[0] = (((icd->lpbiOutput->biWidth * icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
+		frame.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, icd->lpbiOutput->biBitCount);
 		if (frame.output.csp == XVID_CSP_I420 || frame.output.csp == XVID_CSP_YV12)
-			frame.output.stride[0] = (frame.output.stride[0]*2)/3;
+			frame.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, 8);
 	}
 	else
 	{