--- trunk/vfw/src/codec.c	2002/03/08 02:46:11	3
+++ trunk/vfw/src/codec.c	2002/04/08 12:51:41	109
@@ -23,7 +23,21 @@
  *
  *	History:
  *
- *	... ???
+ *	04.04.2002	separated 2-pass code to 2pass.c
+ *				interlacing support
+ *				hinted ME support
+ *	23.03.2002	daniel smith <danielsmith@astroboymail.com>
+ *				changed inter4v to only be in modes 5 or 6
+ *				fixed null mode crash ?
+ *				merged foxer's alternative 2-pass code
+ *				added DEBUGERR output on errors instead of returning
+ *	16.03.2002	daniel smith <danielsmith@astroboymail.com>
+ *				changed BITMAPV4HEADER to BITMAPINFOHEADER
+ *					- prevents memcpy crash in compress_get_format()
+ *				credits are processed in external 2pass mode
+ *				motion search precision = 0 now effective in 2-pass
+ *				modulated quantization
+ *				added DX50 fourcc
  *	01.12.2001	inital version; (c)2001 peter ross <suxen_drol@hotmail.com>
  *
  *************************************************************************/
@@ -32,7 +46,7 @@
 #include <vfw.h>
 
 #include "codec.h"
-#include <math.h>	// fabs()
+#include "2pass.h"
 
 int pmvfast_presets[7] = {
 	0, PMV_QUICKSTOP16, PMV_EARLYSTOP16, PMV_EARLYSTOP16 | PMV_EARLYSTOP8,
@@ -46,38 +60,40 @@
 	or XVID_CSP_NULL if failure
 */
 
-int get_colorspace(BITMAPV4HEADER * hdr)
+int get_colorspace(BITMAPINFOHEADER * hdr)
 {
-	if (hdr->bV4Height < 0) 
+	if (hdr->biHeight < 0) 
 	{
-		DEBUG("colorspace: inverted input format not supported");
+		DEBUGERR("colorspace: inverted input format not supported");
 		return XVID_CSP_NULL;
 	}
 	
-	switch(hdr->bV4V4Compression)
+	switch(hdr->biCompression)
 	{
 	case BI_RGB :
-		if (hdr->bV4BitCount == 16)
+		if (hdr->biBitCount == 16)
 		{
 			DEBUG("RGB16 (RGB555)");
 			return XVID_CSP_VFLIP | XVID_CSP_RGB555;
 		}
-		if (hdr->bV4BitCount == 24) 
+		if (hdr->biBitCount == 24) 
 		{
 			DEBUG("RGB24");
 			return XVID_CSP_VFLIP | XVID_CSP_RGB24;
 		}
-		if (hdr->bV4BitCount == 32) 
+		if (hdr->biBitCount == 32) 
 		{
 			DEBUG("RGB32");
 			return XVID_CSP_VFLIP | XVID_CSP_RGB32;
 		}
 
-		DEBUG1("BI_RGB unsupported", hdr->bV4BitCount);
+		DEBUG1("BI_RGB unsupported", hdr->biBitCount);
 		return XVID_CSP_NULL;
 
-	case BI_BITFIELDS :
-		if(hdr->bV4BitCount == 16 &&
+// how do these work in BITMAPINFOHEADER ???
+/*	case BI_BITFIELDS :
+		if (hdr->biBitCount == 16
+		if(hdr->biBitCount == 16 &&
 			hdr->bV4RedMask == 0x7c00 &&
 			hdr->bV4GreenMask == 0x3e0 &&
 			hdr->bV4BlueMask == 0x1f)
@@ -96,7 +112,7 @@
 		
 		DEBUG1("BI_FIELDS unsupported", hdr->bV4BitCount);
 		return XVID_CSP_NULL;
-
+*/
 	case FOURCC_I420:
 	case FOURCC_IYUV:
 		DEBUG("IYUY");
@@ -121,7 +137,7 @@
 		return XVID_CSP_UYVY;
 
 	}
-	DEBUGFOURCC("colorspace: unknown", hdr->bV4V4Compression);
+	DEBUGFOURCC("colorspace: unknown", hdr->biCompression);
 	return XVID_CSP_NULL;
 }
 
@@ -133,8 +149,8 @@
 
 LRESULT compress_query(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
-	BITMAPV4HEADER * inhdr = (BITMAPV4HEADER *)&lpbiInput->bmiHeader;
-	BITMAPV4HEADER * outhdr = (BITMAPV4HEADER *)&lpbiOutput->bmiHeader;
+	BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
+	BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
 
 	if (get_colorspace(inhdr) == XVID_CSP_NULL) 
 	{
@@ -145,9 +161,9 @@
 	{
 		return ICERR_OK;
 	}
-	
-	if (inhdr->bV4Width != outhdr->bV4Width || inhdr->bV4Height != outhdr->bV4Height ||
-		(outhdr->bV4V4Compression != FOURCC_XVID && outhdr->bV4V4Compression != FOURCC_DIVX)) 
+
+	if (inhdr->biWidth != outhdr->biWidth || inhdr->biHeight != outhdr->biHeight ||
+		(outhdr->biCompression != FOURCC_XVID && outhdr->biCompression != FOURCC_DIVX))
 	{
 		return ICERR_BADFORMAT;
 	}
@@ -158,12 +174,12 @@
 
 LRESULT compress_get_format(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
-	BITMAPV4HEADER * inhdr = (BITMAPV4HEADER *)&lpbiInput->bmiHeader;
-	BITMAPV4HEADER * outhdr = (BITMAPV4HEADER *)&lpbiOutput->bmiHeader;
+	BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
+	BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
 
-	if (get_colorspace(inhdr) == XVID_CSP_NULL) 
+	if (get_colorspace(inhdr) == XVID_CSP_NULL)
 	{
-		return ICERR_BADFORMAT;		
+		return ICERR_BADFORMAT;
 	}
 
 	if (lpbiOutput == NULL) 
@@ -171,22 +187,26 @@
 		return sizeof(BITMAPV4HEADER);
 	}
 
-	memcpy(outhdr, inhdr, sizeof(BITMAPV4HEADER));
-	outhdr->bV4Size = sizeof(BITMAPV4HEADER);
-	outhdr->bV4BitCount = 24;  // or 16
-	outhdr->bV4SizeImage = compress_get_size(codec, lpbiInput, lpbiOutput);
-	outhdr->bV4XPelsPerMeter = 0;
-	outhdr->bV4YPelsPerMeter = 0;
-	outhdr->bV4ClrUsed = 0;
-	outhdr->bV4ClrImportant = 0;
+	memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER));
+	outhdr->biSize = sizeof(BITMAPINFOHEADER);
+	outhdr->biBitCount = 24;  // or 16
+	outhdr->biSizeImage = compress_get_size(codec, lpbiInput, lpbiOutput);
+	outhdr->biXPelsPerMeter = 0;
+	outhdr->biYPelsPerMeter = 0;
+	outhdr->biClrUsed = 0;
+	outhdr->biClrImportant = 0;
 
 	if (codec->config.fourcc_used == 0)
 	{
-		outhdr->bV4V4Compression = FOURCC_XVID;
+		outhdr->biCompression = FOURCC_XVID;
+	}
+	else if (codec->config.fourcc_used == 1)
+	{
+		outhdr->biCompression = FOURCC_DIVX;
 	}
 	else
 	{
-		outhdr->bV4V4Compression = FOURCC_DIVX;
+		outhdr->biCompression = FOURCC_DX50;
 	}
 
 	return ICERR_OK;
@@ -195,8 +215,7 @@
 
 LRESULT compress_get_size(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
-	BITMAPV4HEADER * outhdr = (BITMAPV4HEADER *)&lpbiOutput->bmiHeader;
-	return outhdr->bV4Width * outhdr->bV4Height * 3;
+	return lpbiOutput->bmiHeader.biWidth * lpbiOutput->bmiHeader.biHeight * 3;
 }
 
 
@@ -211,7 +230,6 @@
 
 LRESULT compress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
-	BITMAPV4HEADER * inhdr = (BITMAPV4HEADER *)&lpbiInput->bmiHeader;
 	XVID_ENC_PARAM param;
 	XVID_INIT_PARAM init_param;
 
@@ -232,12 +250,16 @@
 		param.bitrate = 0;
 		break;
 
-	case DLG_MODE_2PASS_1:
-	case DLG_MODE_2PASS_2_INT:
-	case DLG_MODE_2PASS_2_EXT:
+	case DLG_MODE_2PASS_1 :
+	case DLG_MODE_2PASS_2_INT :
+	case DLG_MODE_2PASS_2_EXT :
 		param.bitrate = 0;
+		codec->twopass.max_framesize = (int)((double)codec->config.twopass_max_bitrate / 8.0 / ((double)codec->fbase / (double)codec->fincr));
 		break;
 
+	case DLG_MODE_NULL :
+		return ICERR_OK;
+
 	default :
 		break;
 	}
@@ -253,15 +275,15 @@
 	if((codec->config.cpu & XVID_CPU_FORCE) <= 0)
 		codec->config.cpu = init_param.cpu_flags;
 
-	param.width = inhdr->bV4Width;
-	param.height = inhdr->bV4Height;
+	param.width = lpbiInput->bmiHeader.biWidth;
+	param.height = lpbiInput->bmiHeader.biHeight;
 	param.fincr = codec->fincr;
 	param.fbase = codec->fbase;
 	
 	param.rc_buffersize = codec->config.rc_buffersize;
 	
-	param.min_quantizer = codec->config.min_quant;
-	param.max_quantizer = codec->config.max_quant;
+	param.min_quantizer = codec->config.min_pquant;
+	param.max_quantizer = codec->config.max_pquant;
 	param.max_key_interval = codec->config.max_key_interval;
 
 	switch(xvid_encore(0, XVID_ENC_CREATE, &param, NULL)) 
@@ -280,7 +302,8 @@
 	codec->framenum = 0;
 	codec->keyspacing = 0;
 
-	codec->twopass.stats1 = codec->twopass.stats2 = INVALID_HANDLE_VALUE;
+	codec->twopass.hints = codec->twopass.stats1 = codec->twopass.stats2 = INVALID_HANDLE_VALUE;
+	codec->twopass.hintstream = NULL;
 
 	return ICERR_OK;
 }
@@ -291,6 +314,11 @@
 	if (codec->ehandle != NULL)
 	{
 		xvid_encore(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
+
+		if (codec->twopass.hints != INVALID_HANDLE_VALUE)
+		{
+			CloseHandle(codec->twopass.hints);
+		}
 		if (codec->twopass.stats1 != INVALID_HANDLE_VALUE)
 		{
 			CloseHandle(codec->twopass.stats1);
@@ -299,7 +327,14 @@
 		{
 			CloseHandle(codec->twopass.stats2);
 		}
+		if (codec->twopass.hintstream != NULL)
+		{
+			free(codec->twopass.hintstream);
+		}
+
 		codec->ehandle = NULL;
+
+		codec_2pass_finish(codec);
 	}
 
 	return ICERR_OK;
@@ -308,8 +343,8 @@
 
 LRESULT compress(CODEC * codec, ICCOMPRESS * icc)
 {
-	BITMAPV4HEADER * inhdr = (BITMAPV4HEADER *)icc->lpbiInput;
-	BITMAPV4HEADER * outhdr = (BITMAPV4HEADER *)icc->lpbiOutput;
+	BITMAPINFOHEADER * inhdr = icc->lpbiInput;
+	BITMAPINFOHEADER * outhdr = icc->lpbiOutput;
 	XVID_ENC_FRAME frame;
 	XVID_ENC_STATS stats;
 	
@@ -324,49 +359,60 @@
 
 	frame.general = 0;
 	frame.motion = 0;
-
-	if(codec->config.motion_search == 0)
-		frame.intra = 1;
+	frame.intra = -1;
 
 	frame.general |= XVID_HALFPEL;
 
-	if(codec->config.motion_search > 3)
+	if(codec->config.motion_search > 4)
 		frame.general |= XVID_INTER4V;
 
-	// we actually need "default/custom" selectbox for both inter/intra
-	// this will do for now
+	if(((codec->config.mode == DLG_MODE_2PASS_1) ? 0 : codec->config.lum_masking) == 1)
+		frame.general |= XVID_LUMIMASKING;
+
+	if (codec->config.interlacing)
+		frame.general |= XVID_INTERLACING;
 
-	if ((codec->config.quant_type == QUANT_MODE_CUSTOM) && (codec->config.quant_type == 1))
+	if (codec->config.hinted_me && codec->config.mode == DLG_MODE_2PASS_1)
 	{
-		frame.general |= XVID_CUSTOM_QMATRIX; 
-		frame.quant_intra_matrix = codec->config.qmatrix_intra;
-		frame.quant_inter_matrix = codec->config.qmatrix_inter;
+		frame.hint.hintstream = codec->twopass.hintstream;
+		frame.hint.rawhints = 0;
+		frame.general |= XVID_HINTEDME_GET;
 	}
-	else
+	else if (codec->config.hinted_me && (codec->config.mode == DLG_MODE_2PASS_2_EXT || codec->config.mode == DLG_MODE_2PASS_2_INT))
 	{
-		frame.quant_intra_matrix = NULL;
-		frame.quant_inter_matrix = NULL;
-	}
+		DWORD read;
+		DWORD blocksize;
 
-	if(codec->config.quant_type == 0)
-		frame.general |= XVID_H263QUANT;
-	else
-		frame.general |= XVID_MPEGQUANT;
+		frame.hint.hintstream = codec->twopass.hintstream;
+		frame.hint.rawhints = 0;
+		frame.general |= XVID_HINTEDME_SET;
 
-	if(((codec->config.mode == DLG_MODE_2PASS_1) ? 0 : codec->config.lum_masking) == 1)
-		frame.general |= XVID_LUMIMASKING;
+		if (codec->twopass.hints == INVALID_HANDLE_VALUE)
+		{
+			codec->twopass.hints = CreateFile(codec->config.hintfile, GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0);
+			if (codec->twopass.hints == INVALID_HANDLE_VALUE)
+			{
+				DEBUGERR("couldn't open hints file");
+				return ICERR_ERROR;
+			}
+		}
+		if (!ReadFile(codec->twopass.hints, &blocksize, sizeof(DWORD), &read, 0) || read != sizeof(DWORD) ||
+			!ReadFile(codec->twopass.hints, frame.hint.hintstream, blocksize, &read, 0) || read != blocksize)
+		{
+			DEBUGERR("couldn't read from hints file");
+			return ICERR_ERROR;
+		}
+	}
 
 	frame.motion = pmvfast_presets[codec->config.motion_search];
-	
+
 	frame.image = icc->lpInput;
 
-	if ((frame.colorspace = get_colorspace(inhdr)) == XVID_CSP_NULL) {
+	if ((frame.colorspace = get_colorspace(inhdr)) == XVID_CSP_NULL)
 		return ICERR_BADFORMAT;
-	}
 
 	frame.bitstream = icc->lpOutput;
 	frame.length = icc->lpbiOutput->biSizeImage;
-	frame.intra = -1;
 
 	switch (codec->config.mode) 
 	{
@@ -391,26 +437,51 @@
 		}
 		if (codec->config.dummy2pass)
 		{
-			outhdr->bV4SizeImage = codec->twopass.bytes2;
+			outhdr->biSizeImage = codec->twopass.bytes2;
 			*icc->lpdwFlags = (codec->twopass.nns1.quant & NNSTATS_KEYFRAME) ? AVIIF_KEYFRAME : 0;
 			return ICERR_OK;
 		}
 		break;
 
 	case DLG_MODE_NULL :
-		outhdr->bV4SizeImage = 0;
+		outhdr->biSizeImage = 0;
 		*icc->lpdwFlags = AVIIF_KEYFRAME;
 		return ICERR_OK;
 
 	default :
-		DEBUG("Invalid encoding mode");
+		DEBUGERR("Invalid encoding mode");
 		return ICERR_ERROR;
 	}
 
-	// force keyframe spacing in 2-pass modes
-	if ((codec->keyspacing < codec->config.min_key_interval && codec->framenum) &&
-		(codec->config.mode == DLG_MODE_2PASS_1 || codec->config.mode == DLG_MODE_2PASS_2_INT ||
-		codec->config.mode == DLG_MODE_2PASS_2_EXT))
+	if (codec->config.quant_type == QUANT_MODE_H263)
+	{
+		frame.general |= XVID_H263QUANT;
+	}
+	else
+	{
+		frame.general |= XVID_MPEGQUANT;
+
+		// we actually need "default/custom" selectbox for both inter/intra
+		// this will do for now
+		if (codec->config.quant_type == QUANT_MODE_CUSTOM)
+		{
+			frame.general |= XVID_CUSTOM_QMATRIX; 
+			frame.quant_intra_matrix = codec->config.qmatrix_intra;
+			frame.quant_inter_matrix = codec->config.qmatrix_inter;
+		}
+		else
+		{
+			frame.quant_intra_matrix = NULL;
+			frame.quant_inter_matrix = NULL;
+		}
+	}
+
+	// force keyframe spacing in 2-pass 1st pass
+	if (codec->config.motion_search == 0)
+	{
+		frame.intra = 1;
+	}
+	else if (codec->keyspacing < codec->config.min_key_interval && codec->framenum)
 	{
 		DEBUG("current frame forced to p-frame");
 		frame.intra = 0;
@@ -438,13 +509,32 @@
 		*icc->lpdwFlags = 0;
 	}
 
-	outhdr->bV4SizeImage = frame.length;
+	outhdr->biSizeImage = frame.length;
 
-	if (codec->config.mode == DLG_MODE_2PASS_1)
+	if (codec->config.mode == DLG_MODE_2PASS_1 && codec->config.discard1pass)
 	{
-		if (codec->config.discard1pass)
+		outhdr->biSizeImage = 0;
+	}
+
+	if (frame.general & XVID_HINTEDME_GET)
+	{
+		DWORD wrote;
+		DWORD blocksize = frame.hint.hintlength;
+
+		if (codec->twopass.hints == INVALID_HANDLE_VALUE)
 		{
-			outhdr->bV4SizeImage = 0;
+			codec->twopass.hints = CreateFile(codec->config.hintfile, GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0);
+			if (codec->twopass.hints == INVALID_HANDLE_VALUE)
+			{
+				DEBUGERR("couldn't create hints file");
+				return ICERR_ERROR;
+			}
+		}
+		if (!WriteFile(codec->twopass.hints, &frame.hint.hintlength, sizeof(int), &wrote, 0) || wrote != sizeof(int) ||
+			!WriteFile(codec->twopass.hints, frame.hint.hintstream, blocksize, &wrote, 0) || wrote != blocksize)
+		{
+			DEBUGERR("couldn't write to hints file");
+			return ICERR_ERROR;
 		}
 	}
 
@@ -462,15 +552,15 @@
 
 LRESULT decompress_query(CODEC * codec, BITMAPINFO *lpbiInput, BITMAPINFO *lpbiOutput)
 {
-	BITMAPV4HEADER * inhdr = (BITMAPV4HEADER *)&lpbiInput->bmiHeader;
-	BITMAPV4HEADER * outhdr = (BITMAPV4HEADER *)&lpbiOutput->bmiHeader;
+	BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
+	BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
 
 	if (lpbiInput == NULL) 
 	{
 		return ICERR_ERROR;
 	}
 
-	if (inhdr->bV4V4Compression != FOURCC_XVID && inhdr->bV4V4Compression != FOURCC_DIVX)
+	if (inhdr->biCompression != FOURCC_XVID && inhdr->biCompression != FOURCC_DIVX)
 	{
 		return ICERR_BADFORMAT;
 	}
@@ -480,8 +570,8 @@
 		return ICERR_OK;
 	}
 
-	if (inhdr->bV4Width != outhdr->bV4Width ||
-		inhdr->bV4Height != outhdr->bV4Height ||
+	if (inhdr->biWidth != outhdr->biWidth ||
+		inhdr->biHeight != outhdr->biHeight ||
 		get_colorspace(outhdr) == XVID_CSP_NULL) 
 	{
 		return ICERR_BADFORMAT;
@@ -493,13 +583,13 @@
 
 LRESULT decompress_get_format(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
-	BITMAPV4HEADER * inhdr = (BITMAPV4HEADER *)&lpbiInput->bmiHeader;
-	BITMAPV4HEADER * outhdr = (BITMAPV4HEADER *)&lpbiOutput->bmiHeader;
+	BITMAPINFOHEADER * inhdr = &lpbiInput->bmiHeader;
+	BITMAPINFOHEADER * outhdr = &lpbiOutput->bmiHeader;
 	LRESULT result;
 
 	if (lpbiOutput == NULL) 
 	{
-		return sizeof(BITMAPV4HEADER);
+		return sizeof(BITMAPINFOHEADER);
 	}
 
 	result = decompress_query(codec, lpbiInput, lpbiOutput);
@@ -508,14 +598,14 @@
 		return result;
 	}
 
-	memcpy(outhdr, inhdr, sizeof(BITMAPV4HEADER));
-	outhdr->bV4Size = sizeof(BITMAPV4HEADER);
-	outhdr->bV4V4Compression = FOURCC_YUY2;
-	outhdr->bV4SizeImage = outhdr->bV4Width * outhdr->bV4Height * outhdr->bV4BitCount;
-	outhdr->bV4XPelsPerMeter = 0;
-	outhdr->bV4YPelsPerMeter = 0;
-	outhdr->bV4ClrUsed = 0;
-	outhdr->bV4ClrImportant = 0;
+	memcpy(outhdr, inhdr, sizeof(BITMAPINFOHEADER));
+	outhdr->biSize = sizeof(BITMAPINFOHEADER);
+	outhdr->biCompression = FOURCC_YUY2;
+	outhdr->biSizeImage = outhdr->biWidth * outhdr->biHeight * outhdr->biBitCount;
+	outhdr->biXPelsPerMeter = 0;
+	outhdr->biYPelsPerMeter = 0;
+	outhdr->biClrUsed = 0;
+	outhdr->biClrImportant = 0;
 
 	return ICERR_OK;
 }
@@ -523,8 +613,6 @@
 
 LRESULT decompress_begin(CODEC * codec, BITMAPINFO * lpbiInput, BITMAPINFO * lpbiOutput)
 {
-	BITMAPV4HEADER * inhdr = (BITMAPV4HEADER *)&lpbiInput->bmiHeader;
-	BITMAPV4HEADER * outhdr = (BITMAPV4HEADER *)&lpbiOutput->bmiHeader;
 	XVID_DEC_PARAM param;
 	XVID_INIT_PARAM init_param;
 
@@ -535,8 +623,8 @@
 		codec->config.cpu = init_param.cpu_flags;
 	}
 
-	param.width = inhdr->bV4Width;
-	param.height = inhdr->bV4Height;
+	param.width = lpbiInput->bmiHeader.biWidth;
+	param.height = lpbiInput->bmiHeader.biHeight;
 
 	switch(xvid_decore(0, XVID_DEC_CREATE, &param, NULL)) 
 	{
@@ -569,8 +657,6 @@
 
 LRESULT decompress(CODEC * codec, ICDECOMPRESS * icd)
 {
-	BITMAPV4HEADER * inhdr = (BITMAPV4HEADER *)icd->lpbiInput;
-	BITMAPV4HEADER * outhdr = (BITMAPV4HEADER *)icd->lpbiOutput;
 	XVID_DEC_FRAME frame;
 	
 	frame.bitstream = icd->lpInput;
@@ -581,7 +667,7 @@
 
 	if (~((icd->dwFlags & ICDECOMPRESS_HURRYUP) | (icd->dwFlags & ICDECOMPRESS_UPDATE)))
 	{
-		if ((frame.colorspace = get_colorspace(outhdr)) == XVID_CSP_NULL) 
+		if ((frame.colorspace = get_colorspace(icd->lpbiOutput)) == XVID_CSP_NULL) 
 		{
 			return ICERR_BADFORMAT;
 		}
@@ -606,371 +692,6 @@
 	return ICERR_OK;
 }
 
-int codec_2pass_init(CODEC* codec)
-{
-	TWOPASS *twopass = &codec->twopass;
-	DWORD version = -20;
-	DWORD read, wrote;
-
-	int	frames = 0, credits_frames = 0, i_frames = 0;
-	__int64 total = 0, i_total = 0, i_boost_total = 0, start = 0, end = 0, start_curved = 0, end_curved = 0;
-	__int64 desired = codec->config.desired_size * 1024;
-
-	double total1 = 0.0;
-	double total2 = 0.0;
-
-	switch (codec->config.mode)
-	{
-	case DLG_MODE_2PASS_1 :
-		twopass->stats1 = CreateFile(codec->config.stats1, GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
-		if (twopass->stats1 == INVALID_HANDLE_VALUE) 
-		{
-			DEBUG("2pass init error - couldn't create stats1");
-			return ICERR_ERROR;
-		}
-		if (WriteFile(twopass->stats1, &version, sizeof(DWORD), &wrote, 0) == 0 || wrote != sizeof(DWORD)) 
-		{
-			CloseHandle(twopass->stats1);
-			twopass->stats1 = INVALID_HANDLE_VALUE;
-			DEBUG("2pass init error - couldn't write to stats1");
-			return ICERR_ERROR;
-		}
-		break;
-	
-	case DLG_MODE_2PASS_2_INT :
-	case DLG_MODE_2PASS_2_EXT :
-		twopass->stats1 = CreateFile(codec->config.stats1, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-		if (twopass->stats1 == INVALID_HANDLE_VALUE) 
-		{
-			DEBUG("2pass init error - couldn't open stats1");
-			return ICERR_ERROR;
-		}
-		if (ReadFile(twopass->stats1, &version, sizeof(DWORD), &read, 0) == 0 || read != sizeof(DWORD)) 
-		{
-			CloseHandle(twopass->stats1);
-			twopass->stats1 = INVALID_HANDLE_VALUE;
-			DEBUG("2pass init error - couldn't read from stats1");
-			return ICERR_ERROR;
-		}
-		if (version != -20)
-		{
-			CloseHandle(twopass->stats1);
-			twopass->stats1 = INVALID_HANDLE_VALUE;
-			DEBUG("2pass init error - wrong .stats version");
-			return ICERR_ERROR;
-		}
-
-		if (codec->config.mode == DLG_MODE_2PASS_2_EXT)
-		{
-			if (twopass->stats2 != INVALID_HANDLE_VALUE)
-			{
-				CloseHandle(twopass->stats2);
-			}
-
-			twopass->stats2 = CreateFile(codec->config.stats2, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-
-			if (twopass->stats2 == INVALID_HANDLE_VALUE) 
-			{
-				CloseHandle(twopass->stats1);
-				twopass->stats1 = INVALID_HANDLE_VALUE;
-				DEBUG("2pass init error - couldn't open stats2");
-				return ICERR_ERROR;
-			}
-			if (ReadFile(twopass->stats2, &version, sizeof(DWORD), &read, 0) == 0 || read != sizeof(DWORD)) 
-			{
-				CloseHandle(twopass->stats1);
-				twopass->stats1 = INVALID_HANDLE_VALUE;
-				CloseHandle(twopass->stats2);
-				twopass->stats2 = INVALID_HANDLE_VALUE;
-				DEBUG("2pass init error - couldn't read from stats2");
-				return ICERR_ERROR;
-			}
-			if (version != -20)
-			{	
-				CloseHandle(twopass->stats1);
-				twopass->stats1 = INVALID_HANDLE_VALUE;
-				CloseHandle(twopass->stats2);
-				twopass->stats2 = INVALID_HANDLE_VALUE;
-				DEBUG("2pass init error - wrong .stats version");
-				return ICERR_ERROR;
-			}
-
-			while (1)
-			{
-				if (!ReadFile(twopass->stats1, &twopass->nns1, sizeof(NNSTATS), &read, NULL) || read != sizeof(NNSTATS) ||
-					!ReadFile(twopass->stats2, &twopass->nns2, sizeof(NNSTATS), &read, NULL) || read != sizeof(NNSTATS))
-				{
-					DWORD err = GetLastError();
-
-					if (err == ERROR_HANDLE_EOF || err == ERROR_SUCCESS)
-					{
-						break;
-					}
-					else
-					{
-						CloseHandle(twopass->stats1);
-						CloseHandle(twopass->stats2);
-						twopass->stats1 = INVALID_HANDLE_VALUE;
-						twopass->stats2 = INVALID_HANDLE_VALUE;
-						DEBUG("2pass init error - incomplete stats1/stats2 record?");
-						return ICERR_ERROR;
-					}
-				}
-
-				if (!codec_is_in_credits(&codec->config, frames))
-				{
-					if (twopass->nns1.quant & NNSTATS_KEYFRAME)
-					{
-						i_boost_total = twopass->nns2.bytes * codec->config.keyframe_boost / 100;
-						i_total += twopass->nns2.bytes;
-						++i_frames;
-					}
-
-					total += twopass->nns2.bytes;
-				}
-				else
-					++credits_frames;
-
-				++frames;
-			}
-
-			twopass->movie_curve = ((float)(total + i_boost_total) / total);
-			twopass->average_frame = ((double)(total - i_total) / (frames - credits_frames - i_frames) / twopass->movie_curve);
-
-			SetFilePointer(twopass->stats1, sizeof(DWORD), 0, FILE_BEGIN);
-			SetFilePointer(twopass->stats2, sizeof(DWORD), 0, FILE_BEGIN);
-
-			// perform prepass to compensate for over/undersizing
-			frames = 0;
-
-			while (1)
-			{
-				if (!ReadFile(twopass->stats1, &twopass->nns1, sizeof(NNSTATS), &read, NULL) || read != sizeof(NNSTATS) ||
-					!ReadFile(twopass->stats2, &twopass->nns2, sizeof(NNSTATS), &read, NULL) || read != sizeof(NNSTATS))
-				{
-					DWORD err = GetLastError();
-
-					if (err == ERROR_HANDLE_EOF || err == ERROR_SUCCESS)
-					{
-						break;
-					}
-					else
-					{
-						CloseHandle(twopass->stats1);
-						CloseHandle(twopass->stats2);
-						twopass->stats1 = INVALID_HANDLE_VALUE;
-						twopass->stats2 = INVALID_HANDLE_VALUE;
-						DEBUG("2pass init error - incomplete stats1/stats2 record?");
-						return ICERR_ERROR;
-					}
-				}
-
-				if (!codec_is_in_credits(&codec->config, frames) &&
-					!(twopass->nns1.quant & NNSTATS_KEYFRAME))
-				{
-					double dbytes = twopass->nns2.bytes / twopass->movie_curve;
-					total1 += dbytes;
-
-					if (dbytes > twopass->average_frame)
-					{
-						total2 += ((double)dbytes + (twopass->average_frame - dbytes) *
-							codec->config.curve_compression_high / 100.0);
-					}
-					else
-					{
-						total2 += ((double)dbytes + (twopass->average_frame - dbytes) *
-							codec->config.curve_compression_low / 100.0);
-					}
-				}
-
-				++frames;
-			}
-
-			twopass->curve_comp_scale = total1 / total2;
-
-			{
-				int asymmetric_average_frame;
-				char s[100];
-
-				asymmetric_average_frame = (int)(twopass->average_frame * twopass->curve_comp_scale);
-				wsprintf(s, "middle frame size for asymmetric curve compression: %i", asymmetric_average_frame);
-				DEBUG2P(s);
-			}
-
-			SetFilePointer(twopass->stats1, sizeof(DWORD), 0, FILE_BEGIN);
-			SetFilePointer(twopass->stats2, sizeof(DWORD), 0, FILE_BEGIN);
-		}
-		else	// DLG_MODE_2PASS_2_INT
-		{
-			while (1)
-			{
-				if (!ReadFile(twopass->stats1, &twopass->nns1, sizeof(NNSTATS), &read, NULL) || read != sizeof(NNSTATS))
-				{
-					DWORD err = GetLastError();
-
-					if (err == ERROR_HANDLE_EOF || err == ERROR_SUCCESS)
-					{
-						break;
-					}
-					else
-					{
-						CloseHandle(twopass->stats1);
-						twopass->stats1 = INVALID_HANDLE_VALUE;
-						DEBUG("2pass init error - incomplete stats2 record?");
-						return ICERR_ERROR;
-					}
-				}
-
-				if (codec_is_in_credits(&codec->config, frames) == CREDITS_START)
-				{
-					start += twopass->nns1.bytes;
-					++credits_frames;
-				}
-				else if (codec_is_in_credits(&codec->config, frames) == CREDITS_END)
-				{
-					end += twopass->nns1.bytes;
-					++credits_frames;
-				}
-				else if (twopass->nns1.quant & NNSTATS_KEYFRAME)
-				{
-					i_total += twopass->nns1.bytes + twopass->nns1.bytes * codec->config.keyframe_boost / 100;
-					total += twopass->nns1.bytes * codec->config.keyframe_boost / 100;
-					++i_frames;
-				}
-
-				total += twopass->nns1.bytes;
-
-				++frames;
-			}
-
-			// compensate for avi frame overhead
-			desired -= frames * 24;
-
-			switch (codec->config.credits_mode)
-			{
-			case CREDITS_MODE_RATE :
-
-				// credits curve = (total / desired_size) * (100 / credits_rate)
-				twopass->credits_start_curve = twopass->credits_end_curve =
-					((float)total / desired) * ((float)100 / codec->config.credits_rate);
-
-				start_curved = (__int64)(start / twopass->credits_start_curve);
-				end_curved = (__int64)(end / twopass->credits_end_curve);
-
-				// movie curve = (total - credits) / (desired_size - curved credits)
-				twopass->movie_curve = (float)
-					(total - start - end) /
-					(desired - start_curved - end_curved);
-
-				break;
-
-			case CREDITS_MODE_QUANT :
-
-				// movie curve = (total - credits) / (desired_size - credits)
-				twopass->movie_curve = (float)
-					(total - start - end) / (desired - start - end);
-
-				// aid the average asymmetric frame calculation below
-				start_curved = start;
-				end_curved = end;
-
-				break;
-
-			case CREDITS_MODE_SIZE :
-
-				// start curve = (start / start desired size)
-				twopass->credits_start_curve = (float)
-					(start / 1024) / codec->config.credits_start_size;
-
-				// end curve = (end / end desired size)
-				twopass->credits_end_curve = (float)
-					(end / 1024) / codec->config.credits_end_size;
-
-				start_curved = (__int64)(start / twopass->credits_start_curve);
-				end_curved = (__int64)(end / twopass->credits_end_curve);
-
-				// movie curve = (total - credits) / (desired_size - curved credits)
-				twopass->movie_curve = (float)
-					(total - start - end) /
-					(desired - start_curved - end_curved);
-
-				break;
-			}
-
-			// average frame size = (desired - curved credits - curved keyframes) /
-			//	(frames - credits frames - keyframes)
-			twopass->average_frame = (double)
-				(desired - start_curved - end_curved - (i_total / twopass->movie_curve)) /
-				(frames - credits_frames - i_frames);
-
-			SetFilePointer(twopass->stats1, sizeof(DWORD), 0, FILE_BEGIN);
-
-			// perform prepass to compensate for over/undersizing
-			frames = 0;
-
-			while (1)
-			{
-				if (!ReadFile(twopass->stats1, &twopass->nns1, sizeof(NNSTATS), &read, NULL) || read != sizeof(NNSTATS))
-				{
-					DWORD err = GetLastError();
-
-					if (err == ERROR_HANDLE_EOF || err == ERROR_SUCCESS)
-					{
-						break;
-					}
-					else
-					{
-						CloseHandle(twopass->stats1);
-						twopass->stats1 = INVALID_HANDLE_VALUE;
-						DEBUG("2pass init error - incomplete stats2 record?");
-						return ICERR_ERROR;
-					}
-				}
-
-				if (!codec_is_in_credits(&codec->config, frames) &&
-					!(twopass->nns1.quant & NNSTATS_KEYFRAME))
-				{
-					double dbytes = twopass->nns1.bytes / twopass->movie_curve;
-					total1 += dbytes;
-
-					if (dbytes > twopass->average_frame)
-					{
-						total2 += ((double)dbytes + (twopass->average_frame - dbytes) *
-							codec->config.curve_compression_high / 100.0);
-					}
-					else
-					{
-						total2 += ((double)dbytes + (twopass->average_frame - dbytes) *
-							codec->config.curve_compression_low / 100.0);
-					}
-				}
-
-				++frames;
-			}
-
-			twopass->curve_comp_scale = total1 / total2;
-
-			{
-				int asymmetric_average_frame;
-				char s[100];
-
-				asymmetric_average_frame = (int)(twopass->average_frame * twopass->curve_comp_scale);
-				wsprintf(s, "middle frame size for asymmetric curve compression: %i", asymmetric_average_frame);
-				DEBUG2P(s);
-			}
-
-			SetFilePointer(twopass->stats1, sizeof(DWORD), 0, FILE_BEGIN);
-		}
-
-		twopass->overflow = 0;
-
-		break;
-	}
-
-	return ICERR_OK;
-}
-
-
 int codec_get_quant(CODEC* codec, XVID_ENC_FRAME* frame)
 {
 	switch (codec->config.mode)
@@ -989,7 +710,7 @@
 				break;
 
 			default :
-				DEBUG("Can't use credits size mode in quality mode");
+				DEBUGERR("Can't use credits size mode in quality mode");
 				return ICERR_ERROR;
 			}
 		}
@@ -1006,8 +727,8 @@
 			{
 			case CREDITS_MODE_RATE :
 				frame->quant =
-					codec->config.max_quant -
-					((codec->config.max_quant - codec->config.quant) * codec->config.credits_rate / 100);
+					codec->config.max_pquant -
+					((codec->config.max_pquant - codec->config.quant) * codec->config.credits_rate / 100);
 				break;
 
 			case CREDITS_MODE_QUANT :
@@ -1015,7 +736,7 @@
 				break;
 
 			default :
-				DEBUG("Can't use credits size mode in quantizer mode");
+				DEBUGERR("Can't use credits size mode in quantizer mode");
 				return ICERR_ERROR;
 			}
 		}
@@ -1044,355 +765,14 @@
 		return ICERR_OK;
 
 	default:
-		DEBUG("get quant: invalid mode");
+		DEBUGERR("get quant: invalid mode");
 		return ICERR_ERROR;
 	}
 }
 
 
-int codec_2pass_get_quant(CODEC* codec, XVID_ENC_FRAME* frame)
-{
-	static double quant_error[32];
-	static double curve_comp_error;
-	static int last_quant;
-
-	TWOPASS * twopass = &codec->twopass;
-
-	DWORD read;
-	int bytes1, bytes2;
-	int overflow;
-	int credits_pos;
-
-	if (codec->framenum == 0)
-	{
-		int i;
-
-		for (i=0 ; i<32 ; ++i)
-		{
-			quant_error[i] = 0.0;
-		}
-
-		curve_comp_error = 0.0;
-		last_quant = 0;
-	}
-
-	if (ReadFile(twopass->stats1, &twopass->nns1, sizeof(NNSTATS), &read, 0) == 0 || read != sizeof(NNSTATS)) 
-	{
-		DEBUG("2ndpass quant: couldn't read from stats1");
-		return ICERR_ERROR;	
-	}
-	if (codec->config.mode == DLG_MODE_2PASS_2_EXT)
-	{
-		if (ReadFile(twopass->stats2, &twopass->nns2, sizeof(NNSTATS), &read, 0) == 0 || read != sizeof(NNSTATS)) 
-		{
-			DEBUG("2ndpass quant: couldn't read from stats2");
-			return ICERR_ERROR;	
-		}
-	}
-		
-	bytes1 = twopass->nns1.bytes;
-	overflow = twopass->overflow / 8;
-
-	// override codec i-frame choice (reenable in credits)
-	frame->intra = (twopass->nns1.quant & NNSTATS_KEYFRAME);
-
-	if (frame->intra)
-	{
-		overflow = 0;
-	}
-
-	credits_pos = codec_is_in_credits(&codec->config, codec->framenum);
-
-	if (credits_pos)
-	{
-		if (codec->config.mode == DLG_MODE_2PASS_2_INT)
-		{
-			switch (codec->config.credits_mode)
-			{
-			case CREDITS_MODE_RATE :
-			case CREDITS_MODE_SIZE :
-				if (credits_pos == CREDITS_START)
-				{
-					bytes2 = (int)(bytes1 / twopass->credits_start_curve);
-				}
-				else // CREDITS_END
-				{
-					bytes2 = (int)(bytes1 / twopass->credits_end_curve);
-				}
-
-				frame->intra = -1;
-				break;
-
-			case CREDITS_MODE_QUANT :
-				if (codec->config.credits_quant_i != codec->config.credits_quant_p)
-				{
-					frame->quant = frame->intra ?
-						codec->config.credits_quant_i :
-						codec->config.credits_quant_p;
-				}
-				else
-				{
-					frame->quant = codec->config.credits_quant_p;
-					frame->intra = -1;
-				}
-
-				twopass->bytes1 = bytes1;
-				twopass->bytes2 = bytes1;
-				twopass->desired_bytes2 = bytes1;
-				return ICERR_OK;
-			}
-		}
-		else	// DLG_MODE_2PASS_2_EXT
-		{
-			bytes2 = twopass->nns2.bytes;
-		}
-	}
-	else	// Foxer: apply curve compression outside credits
-	{
-		double dbytes, curve_temp;
-
-		bytes2 = (codec->config.mode == DLG_MODE_2PASS_2_INT) ? bytes1 : twopass->nns2.bytes;
-
-		if (frame->intra)
-		{
-			dbytes = ((int)(bytes2 + bytes2 * codec->config.keyframe_boost / 100)) /
-				twopass->movie_curve;
-		}
-		else
-		{
-			dbytes = bytes2 / twopass->movie_curve;
-		}
-
-		// spread the compression error across payback_delay frames
-		if (codec->config.bitrate_payback_method == 0)
-		{
-			bytes2 = (int)(curve_comp_error / codec->config.bitrate_payback_delay);
-		}
-		else
-		{
-			bytes2 = (int)(curve_comp_error * dbytes /
-				twopass->average_frame / codec->config.bitrate_payback_delay);
-
-			if (labs(bytes2) > fabs(curve_comp_error))
-			{
-				bytes2 = (int)curve_comp_error;
-			}
-		}
-
-		curve_comp_error -= bytes2;
-
-		if ((codec->config.curve_compression_high + codec->config.curve_compression_low) &&
-			!frame->intra)
-		{
-			if (dbytes > twopass->average_frame)
-			{
-				curve_temp = twopass->curve_comp_scale *
-					((double)dbytes + (twopass->average_frame - dbytes) *
-					codec->config.curve_compression_high / 100.0);
-			}
-			else
-			{
-				curve_temp = twopass->curve_comp_scale *
-					((double)dbytes + (twopass->average_frame - dbytes) *
-					codec->config.curve_compression_low / 100.0);
-			}
-
-			bytes2 += ((int)curve_temp);
-			curve_comp_error += curve_temp - ((int)curve_temp);
-		}
-		else
-		{
-			curve_comp_error += dbytes - ((int)dbytes);
-			bytes2 += ((int)dbytes);
-		}
-
-		// cap bytes2 to first pass size, lowers number of quant=1 frames
-		if (bytes2 > bytes1)
-		{
-			curve_comp_error += bytes2 - bytes1;
-			bytes2 = bytes1;
-		}
-		else if (bytes2 < 1)
-		{
-			curve_comp_error += --bytes2;
-			bytes2 = 1;
-		}
-	}
-
-	twopass->desired_bytes2 = bytes2;
-
-	// Foxer: scale overflow in relation to average size, so smaller frames don't get
-	// too much/little bitrate
-	overflow = (int)((double)overflow * bytes2 / twopass->average_frame);
-
-	// Foxer: reign in overflow with huge frames
-	if (labs(overflow) > labs(twopass->overflow))
-	{
-		overflow = twopass->overflow;
-	}
-
-	// Foxer: make sure overflow doesn't run away
-	if (overflow > bytes2 * 6 / 10)
-	{
-		bytes2 += (overflow <= bytes2) ? bytes2 * 6 / 10 : overflow * 6 / 10;
-	}
-	else if (overflow < bytes2 * -6 / 10)
-	{
-		bytes2 += bytes2 * -6 / 10;
-	}
-	else
-	{
-		bytes2 += overflow;
-	}
-
-	if (bytes2 < 1) 
-	{
-		bytes2 = 1;
-	}
-
-	twopass->bytes1 = bytes1;
-	twopass->bytes2 = bytes2;
-
-	// very 'simple' quant<->filesize relationship
-	frame->quant = ((twopass->nns1.quant & ~NNSTATS_KEYFRAME) * bytes1) / bytes2;
-
-	if (frame->quant < 1)
-	{
-		frame->quant = 1;
-	}
-	else if (frame->quant > 31)
-	{
-		frame->quant = 31;
-	}
-	else if (!frame->intra)
-	{
-		// Foxer: aid desired quantizer precision by accumulating decision error
-		quant_error[frame->quant] += ((double)((twopass->nns1.quant & ~NNSTATS_KEYFRAME) * 
-			bytes1) / bytes2) - frame->quant;
-
-		if (quant_error[frame->quant] >= 1.0)
-		{
-			quant_error[frame->quant] -= 1.0;
-			++frame->quant;
-		}
-	}
-
-	// we're done with credits
-	if (codec_is_in_credits(&codec->config, codec->framenum))
-	{
-		return ICERR_OK;
-	}
-
-	if (frame->intra)
-	{
-		if (frame->quant < codec->config.min_iquant)
-		{
-			frame->quant = codec->config.min_iquant;
-			DEBUG2P("I-frame quantizer raised");
-		}
-		if (frame->quant > codec->config.max_iquant)
-		{
-			frame->quant = codec->config.max_iquant;
-			DEBUG2P("I-frame quantizer lowered");
-		}
-	}
-	else
-	{
-		if (frame->quant > codec->config.max_quant)
-		{
-			frame->quant = codec->config.max_quant;
-		}
-		if (frame->quant < codec->config.min_quant)
-		{
-			frame->quant = codec->config.min_quant;
-		}
-
-		// subsequent frame quants can only be +- 2
-		if (last_quant)
-		{
-			if (frame->quant > last_quant + 2)
-			{
-				frame->quant = last_quant + 2;
-				DEBUG2P("P-frame quantizer prevented from rising too steeply");
-			}
-			if (frame->quant < last_quant - 2)
-			{
-				frame->quant = last_quant - 2;
-				DEBUG2P("P-frame quantizer prevented from falling too steeply");
-			}
-		}
-	}
-
-	last_quant = frame->quant;
-
-	return ICERR_OK;
-}
-
-
-int codec_2pass_update(CODEC* codec, XVID_ENC_FRAME* frame, XVID_ENC_STATS* stats)
-{
-	static __int64 total_size;
-
-	NNSTATS nns1;
-	DWORD wrote;
-
-	if (codec->framenum == 0)
-	{
-		total_size = 0;
-	}
-	
-	switch (codec->config.mode)
-	{
-	case DLG_MODE_2PASS_1 :
-		nns1.bytes = frame->length;	// total bytes
-		nns1.dd_v = stats->hlength;	// header bytes
-
-		nns1.dd_u = nns1.dd_y = 0;
-		nns1.dk_v = nns1.dk_u = nns1.dk_y = 0;
-		nns1.md_u = nns1.md_y = 0;
-		nns1.mk_u = nns1.mk_y = 0;
-
-		nns1.quant = stats->quant;
-		if (frame->intra) 
-		{
-			nns1.quant |= NNSTATS_KEYFRAME;
-		}
-		nns1.kblk = stats->kblks;
-		nns1.mblk = stats->mblks;
-		nns1.ublk = stats->ublks;
-		nns1.lum_noise[0] = nns1.lum_noise[1] = 1;
-
-		total_size += frame->length;
-		DEBUG1ST(frame->length, (int)total_size/1024, frame->intra, frame->quant, stats->kblks, stats->mblks)
-		
-		if (WriteFile(codec->twopass.stats1, &nns1, sizeof(NNSTATS), &wrote, 0) == 0 || wrote != sizeof(NNSTATS))
-		{
-			DEBUG("stats1: WriteFile error");
-			return ICERR_ERROR;	
-		}
-		break;
-
-	case DLG_MODE_2PASS_2_INT :
-	case DLG_MODE_2PASS_2_EXT :
-		codec->twopass.overflow += codec->twopass.desired_bytes2 - frame->length;
-		DEBUG2ND(frame->quant, frame->intra, codec->twopass.bytes1, codec->twopass.desired_bytes2, frame->length, codec->twopass.overflow, codec_is_in_credits(&codec->config, codec->framenum))
-		break;
-
-	default:
-		break;
-	}
-
-	return ICERR_OK;
-}
-
-
 int codec_is_in_credits(CONFIG* config, int framenum)
 {
-	if (config->mode == DLG_MODE_2PASS_2_EXT)
-	{
-		return 0;
-	}
-
 	if (config->credits_start)
 	{
 		if (framenum >= config->credits_start_begin &&
@@ -1433,20 +813,20 @@
 	if (!config->fquant)
 	{
 		config->fquant =
-			((float) (config->max_quant - config->min_quant) / 100) *
+			((float) (config->max_pquant - config->min_pquant) / 100) *
 			(100 - quality) +
-			(float) config->min_quant;
+			(float) config->min_pquant;
 
 		fquant_running = config->fquant;
 	}
 
-	if (fquant_running < config->min_quant)
+	if (fquant_running < config->min_pquant)
 	{
-		fquant_running = (float) config->min_quant;
+		fquant_running = (float) config->min_pquant;
 	}
-	else if(fquant_running > config->max_quant)
+	else if(fquant_running > config->max_pquant)
 	{
-		fquant_running = (float) config->max_quant;
+		fquant_running = (float) config->max_pquant;
 	}
 
 	quant = (int) fquant_running;