--- branches/dev-api-3/vfw/src/codec.c	2002/11/08 10:11:48	634
+++ branches/dev-api-3/vfw/src/codec.c	2002/12/17 12:58:10	726
@@ -223,11 +223,7 @@
 
 LRESULT compress_get_size(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
-	return
-#ifdef BFRAMES
-	 2 *
-#endif
-	lpbiOutput->bmiHeader.biWidth * lpbiOutput->bmiHeader.biHeight * 3;
+	return 2 * lpbiOutput->bmiHeader.biWidth * lpbiOutput->bmiHeader.biHeight * 3;
 }
 
 
@@ -302,15 +298,15 @@
 	param.num_threads = codec->config.num_threads;
 #endif
 
-#ifdef BFRAMES
 	param.global = 0;
 	if (codec->config.packed) param.global |= XVID_GLOBAL_PACKED;
 	if (codec->config.dx50bvop) param.global |= XVID_GLOBAL_DX50BVOP;
 	if (codec->config.debug) param.global |= XVID_GLOBAL_DEBUG;
+	if (codec->config.reduced_resolution) param.global |= XVID_GLOBAL_REDUCED;
 	param.max_bframes = codec->config.max_bframes;
 	param.bquant_ratio = codec->config.bquant_ratio;
+	param.bquant_offset = codec->config.bquant_offset;
 	param.frame_drop_ratio = codec->config.frame_drop_ratio;
-#endif
 
 	switch(xvid_encore(0, XVID_ENC_CREATE, &param, NULL)) 
 	{
@@ -400,7 +396,19 @@
 	if (codec->config.interlacing)
 		frame.general |= XVID_INTERLACING;
 
+	if (codec->config.qpel) {
+		frame.general |= XVID_QUARTERPEL;
+		frame.motion |= PMV_QUARTERPELREFINE16 | PMV_QUARTERPELREFINE8;
+	}
+
+	if (codec->config.gmc)
+		frame.general |= XVID_GMC;
 
+	if (codec->config.chromame)
+		frame.general |= XVID_ME_COLOUR;
+
+	if (codec->config.reduced_resolution) 
+		frame.general |= XVID_REDUCED;
 
 // added by koepi for credits greyscale
 
@@ -448,15 +456,17 @@
 		}
 	}
 
-	frame.motion = pmvfast_presets[codec->config.motion_search];
+	frame.motion |= pmvfast_presets[codec->config.motion_search];
 
 	frame.image = icc->lpInput;
-	// dev-api-3 
 	frame.stride = (((icc->lpbiInput->biWidth * icc->lpbiInput->biBitCount) + 31) & ~31) >> 3;
 
 	if ((frame.colorspace = get_colorspace(inhdr)) == XVID_CSP_NULL)
 		return ICERR_BADFORMAT;
 
+	if (frame.colorspace == XVID_CSP_I420 || frame.colorspace == XVID_CSP_YV12)
+		frame.stride = (frame.stride*2)/3;
+
 	frame.bitstream = icc->lpOutput;
 	frame.length = icc->lpbiOutput->biSizeImage;
 
@@ -533,9 +543,7 @@
 		frame.intra = 0;
 	}
 
-#ifdef BFRAMES
 	frame.bquant = 0;
-#endif
 
 //	OutputDebugString(" ");
 	switch (xvid_encore(codec->ehandle, XVID_ENC_ENCODE, &frame, &stats)) 
@@ -550,7 +558,7 @@
 		return ICERR_BADFORMAT;	
 	}
 
-	if (frame.intra)
+	if (frame.intra==1)
 	{
 		codec->keyspacing = 0;
 		*icc->lpdwFlags = AVIIF_KEYFRAME;
@@ -589,7 +597,9 @@
 		}
 	}
 
-	codec_2pass_update(codec, &frame, &stats);
+//quick fix for delayed frames
+//	if (frame.intra != 5)
+		codec_2pass_update(codec, &frame, &stats);
 
 	++codec->framenum;
 	++codec->keyspacing;
@@ -611,10 +621,7 @@
 		return ICERR_ERROR;
 	}
 
-	if (inhdr->biCompression != FOURCC_XVID && 
-		inhdr->biCompression != FOURCC_DIVX &&
-		inhdr->biCompression != FOURCC_DX50 &&
-		get_colorspace(inhdr) == XVID_CSP_NULL)
+	if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX && inhdr->biCompression != FOURCC_DX50 && get_colorspace(inhdr) == XVID_CSP_NULL)
 	{
 		return ICERR_BADFORMAT;
 	}
@@ -647,6 +654,7 @@
 	}
 
 	/* --- yv12 --- */
+
 	if (get_colorspace(inhdr) != XVID_CSP_NULL) {
 		memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER));
 		// XXX: should we set outhdr->biSize ??
@@ -723,41 +731,44 @@
 	
 	frame.bitstream = icd->lpInput;
 	frame.length = icd->lpbiInput->biSizeImage;
+	frame.general = XVID_DEC_LOWDELAY;	/* force low_delay_default mode */
+	if (codec->config.deblock_y)
+		frame.general |= XVID_DEC_DEBLOCKY;
+	if (codec->config.deblock_uv)
+		frame.general |= XVID_DEC_DEBLOCKUV;
 
 	frame.image = icd->lpOutput;
-	//frame.stride = icd->lpbiOutput->biWidth;
-	// dev-api-3: 
 	frame.stride = (((icd->lpbiOutput->biWidth * icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
 
 	/* --- yv12 --- */	
 	if (icd->lpbiInput->biCompression != FOURCC_XVID &&
-		icd->lpbiInput->biCompression != FOURCC_DIVX && 
-		icd->lpbiInput->biCompression != FOURCC_DX50) 
+		 icd->lpbiInput->biCompression != FOURCC_DIVX &&
+		 icd->lpbiInput->biCompression != FOURCC_DX50)
 	{
 		XVID_INIT_CONVERTINFO convert;
-
 		DEBUGFOURCC("input", icd->lpbiInput->biCompression);
 		DEBUGFOURCC("output", icd->lpbiOutput->biCompression);
-
 		convert.input.colorspace = get_colorspace(icd->lpbiInput);
 		convert.input.y = icd->lpInput;
-		convert.input.y_stride = (((icd->lpbiInput->biWidth * icd->lpbiInput->biBitCount) + 31) & ~31) >> 3;
+		convert.input.y_stride = (((icd->lpbiInput->biWidth *icd->lpbiInput->biBitCount) + 31) & ~31) >> 3;  
+		if (convert.input.colorspace == XVID_CSP_I420 || convert.input.colorspace == XVID_CSP_YV12)
+			convert.input.y_stride = (convert.input.y_stride*2)/3;
 
 		convert.output.colorspace = get_colorspace(icd->lpbiOutput);
 		convert.output.y = icd->lpOutput;
-		convert.output.y_stride = (((icd->lpbiOutput->biWidth * icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
-		
+		convert.output.y_stride = (((icd->lpbiOutput->biWidth *icd->lpbiOutput->biBitCount) + 31) & ~31) >> 3;
+		if (convert.output.colorspace == XVID_CSP_I420 || convert.output.colorspace == XVID_CSP_YV12)
+			convert.output.y_stride = (convert.output.y_stride*2)/3;
+
 		convert.width = icd->lpbiInput->biWidth;
 		convert.height = icd->lpbiInput->biHeight;
 		convert.interlacing = 0;
-
 		if (convert.input.colorspace == XVID_CSP_NULL ||
 			convert.output.colorspace == XVID_CSP_NULL ||
 			xvid_init(NULL, XVID_INIT_CONVERT, &convert, NULL) != XVID_ERR_OK)
 		{
-			return ICERR_BADFORMAT;
+			 return ICERR_BADFORMAT;
 		}
-
 		return ICERR_OK;
 	}
 	/* --- yv12 --- */
@@ -775,6 +786,9 @@
 		frame.colorspace = XVID_CSP_NULL;
 	}
 
+	if (frame.colorspace == XVID_CSP_I420 || frame.colorspace == XVID_CSP_YV12)
+		frame.stride = (frame.stride*2)/3;
+
 	switch (xvid_decore(codec->dhandle, XVID_DEC_DECODE, &frame, NULL)) 
 	{
 	case XVID_ERR_FAIL :