--- trunk/vfw/src/codec.c	2002/03/08 02:46:11	3
+++ trunk/vfw/src/codec.c	2002/03/23 06:58:56	61
@@ -23,7 +23,18 @@
  *
  *	History:
  *
- *	... ???
+ *	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>
  *
  *************************************************************************/
@@ -46,38 +57,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 +109,7 @@
 		
 		DEBUG1("BI_FIELDS unsupported", hdr->bV4BitCount);
 		return XVID_CSP_NULL;
-
+*/
 	case FOURCC_I420:
 	case FOURCC_IYUV:
 		DEBUG("IYUY");
@@ -121,7 +134,7 @@
 		return XVID_CSP_UYVY;
 
 	}
-	DEBUGFOURCC("colorspace: unknown", hdr->bV4V4Compression);
+	DEBUGFOURCC("colorspace: unknown", hdr->biCompression);
 	return XVID_CSP_NULL;
 }
 
@@ -133,8 +146,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 +158,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 +171,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 +184,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 +212,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 +227,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 +247,15 @@
 		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;
 		break;
 
+	case DLG_MODE_NULL :
+		return ICERR_OK;
+
 	default :
 		break;
 	}
@@ -253,15 +271,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)) 
@@ -308,8 +326,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 +342,25 @@
 
 	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.quant_type == QUANT_MODE_CUSTOM) && (codec->config.quant_type == 1))
-	{
-		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;
-	}
-
-	if(codec->config.quant_type == 0)
-		frame.general |= XVID_H263QUANT;
-	else
-		frame.general |= XVID_MPEGQUANT;
-
 	if(((codec->config.mode == DLG_MODE_2PASS_1) ? 0 : codec->config.lum_masking) == 1)
 		frame.general |= XVID_LUMIMASKING;
 
 	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 +385,52 @@
 		}
 		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) &&
+		(codec->config.mode == DLG_MODE_2PASS_1))
 	{
 		DEBUG("current frame forced to p-frame");
 		frame.intra = 0;
@@ -438,14 +458,11 @@
 		*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->bV4SizeImage = 0;
-		}
+		outhdr->biSizeImage = 0;
 	}
 
 	codec_2pass_update(codec, &frame, &stats);
@@ -462,15 +479,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 +497,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 +510,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 +525,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 +540,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 +550,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 +584,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 +594,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;
 		}
@@ -625,14 +638,14 @@
 		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");
+			DEBUGERR("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");
+			DEBUGERR("2pass init error - couldn't write to stats1");
 			return ICERR_ERROR;
 		}
 		break;
@@ -642,21 +655,21 @@
 		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");
+			DEBUGERR("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");
+			DEBUGERR("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");
+			DEBUGERR("2pass init error - wrong .stats version");
 			return ICERR_ERROR;
 		}
 
@@ -673,7 +686,7 @@
 			{
 				CloseHandle(twopass->stats1);
 				twopass->stats1 = INVALID_HANDLE_VALUE;
-				DEBUG("2pass init error - couldn't open stats2");
+				DEBUGERR("2pass init error - couldn't open stats2");
 				return ICERR_ERROR;
 			}
 			if (ReadFile(twopass->stats2, &version, sizeof(DWORD), &read, 0) == 0 || read != sizeof(DWORD)) 
@@ -682,7 +695,7 @@
 				twopass->stats1 = INVALID_HANDLE_VALUE;
 				CloseHandle(twopass->stats2);
 				twopass->stats2 = INVALID_HANDLE_VALUE;
-				DEBUG("2pass init error - couldn't read from stats2");
+				DEBUGERR("2pass init error - couldn't read from stats2");
 				return ICERR_ERROR;
 			}
 			if (version != -20)
@@ -691,7 +704,7 @@
 				twopass->stats1 = INVALID_HANDLE_VALUE;
 				CloseHandle(twopass->stats2);
 				twopass->stats2 = INVALID_HANDLE_VALUE;
-				DEBUG("2pass init error - wrong .stats version");
+				DEBUGERR("2pass init error - wrong .stats version");
 				return ICERR_ERROR;
 			}
 
@@ -712,7 +725,7 @@
 						CloseHandle(twopass->stats2);
 						twopass->stats1 = INVALID_HANDLE_VALUE;
 						twopass->stats2 = INVALID_HANDLE_VALUE;
-						DEBUG("2pass init error - incomplete stats1/stats2 record?");
+						DEBUGERR("2pass init error - incomplete stats1/stats2 record?");
 						return ICERR_ERROR;
 					}
 				}
@@ -743,6 +756,50 @@
 			// perform prepass to compensate for over/undersizing
 			frames = 0;
 
+			if (codec->config.use_alt_curve)
+			{
+				twopass->alt_curve_low = twopass->average_frame - twopass->average_frame * (double)codec->config.alt_curve_low_dist / 100.0;
+				twopass->alt_curve_low_diff = twopass->average_frame - twopass->alt_curve_low;
+				twopass->alt_curve_high = twopass->average_frame + twopass->average_frame * (double)codec->config.alt_curve_high_dist / 100.0;
+				twopass->alt_curve_high_diff = twopass->alt_curve_high - twopass->average_frame;
+				if (codec->config.alt_curve_use_auto)
+				{
+					if (twopass->movie_curve > 1.0f)
+					{
+						codec->config.alt_curve_min_rel_qual = (int)(100.0 - (100.0 - 100.0 / twopass->movie_curve) * (double)codec->config.alt_curve_auto_str / 100.0);
+						if (codec->config.alt_curve_min_rel_qual < 20)
+							codec->config.alt_curve_min_rel_qual = 20;
+					}
+					else
+						codec->config.alt_curve_min_rel_qual = 100;
+				}
+				twopass->alt_curve_mid_qual = (1.0 + (double)codec->config.alt_curve_min_rel_qual / 100.0) / 2.0;
+				twopass->alt_curve_qual_dev = 1.0 - twopass->alt_curve_mid_qual;
+				if (codec->config.alt_curve_low_dist > 100)
+				{
+					switch(codec->config.alt_curve_type)
+					{
+					case 2: // Sine Curve (high aggressiveness)
+						twopass->alt_curve_qual_dev *= 2.0 / (1.0 + 
+							sin(DEG2RAD * (twopass->average_frame * 90.0 / twopass->alt_curve_low_diff)));
+						twopass->alt_curve_mid_qual = 1.0 - twopass->alt_curve_qual_dev *
+							sin(DEG2RAD * (twopass->average_frame * 90.0 / twopass->alt_curve_low_diff));
+						break;
+					case 1: // Linear (medium aggressiveness)
+						twopass->alt_curve_qual_dev *= 2.0 / (1.0 +
+							twopass->average_frame / twopass->alt_curve_low_diff);
+						twopass->alt_curve_mid_qual = 1.0 - twopass->alt_curve_qual_dev *
+							twopass->average_frame / twopass->alt_curve_low_diff;
+						break;
+					case 0: // Cosine Curve (low aggressiveness)
+						twopass->alt_curve_qual_dev *= 2.0 / (1.0 + 
+							(1.0 - cos(DEG2RAD * (twopass->average_frame * 90.0 / twopass->alt_curve_low_diff))));
+						twopass->alt_curve_mid_qual = 1.0 - twopass->alt_curve_qual_dev *
+							(1.0 - cos(DEG2RAD * (twopass->average_frame * 90.0 / twopass->alt_curve_low_diff)));
+					}
+				}
+			}
+
 			while (1)
 			{
 				if (!ReadFile(twopass->stats1, &twopass->nns1, sizeof(NNSTATS), &read, NULL) || read != sizeof(NNSTATS) ||
@@ -760,7 +817,7 @@
 						CloseHandle(twopass->stats2);
 						twopass->stats1 = INVALID_HANDLE_VALUE;
 						twopass->stats2 = INVALID_HANDLE_VALUE;
-						DEBUG("2pass init error - incomplete stats1/stats2 record?");
+						DEBUGERR("2pass init error - incomplete stats1/stats2 record?");
 						return ICERR_ERROR;
 					}
 				}
@@ -771,15 +828,65 @@
 					double dbytes = twopass->nns2.bytes / twopass->movie_curve;
 					total1 += dbytes;
 
-					if (dbytes > twopass->average_frame)
+					if (codec->config.use_alt_curve)
 					{
-						total2 += ((double)dbytes + (twopass->average_frame - dbytes) *
-							codec->config.curve_compression_high / 100.0);
+						if (dbytes > twopass->average_frame)
+						{
+							if (dbytes >= twopass->alt_curve_high)
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev);
+							else
+							{
+								switch(codec->config.alt_curve_type)
+								{
+								case 2:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									sin(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_high_diff)));
+									break;
+								case 1:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									(dbytes - twopass->average_frame) / twopass->alt_curve_high_diff);
+									break;
+								case 0:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									(1.0 - cos(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_high_diff))));
+								}
+							}
+						}
+						else
+						{
+							if (dbytes <= twopass->alt_curve_low)
+								total2 += dbytes;
+							else
+							{
+								switch(codec->config.alt_curve_type)
+								{
+								case 2:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									sin(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_low_diff)));
+									break;
+								case 1:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									(dbytes - twopass->average_frame) / twopass->alt_curve_low_diff);
+									break;
+								case 0:
+								total2 += dbytes * (twopass->alt_curve_mid_qual + twopass->alt_curve_qual_dev *
+									(1.0 - cos(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_low_diff))));
+								}
+							}
+						}
 					}
 					else
 					{
-						total2 += ((double)dbytes + (twopass->average_frame - dbytes) *
-							codec->config.curve_compression_low / 100.0);
+						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);
+						}
 					}
 				}
 
@@ -788,6 +895,7 @@
 
 			twopass->curve_comp_scale = total1 / total2;
 
+			if (!codec->config.use_alt_curve)
 			{
 				int asymmetric_average_frame;
 				char s[100];
@@ -816,7 +924,7 @@
 					{
 						CloseHandle(twopass->stats1);
 						twopass->stats1 = INVALID_HANDLE_VALUE;
-						DEBUG("2pass init error - incomplete stats2 record?");
+						DEBUGERR("2pass init error - incomplete stats2 record?");
 						return ICERR_ERROR;
 					}
 				}
@@ -908,6 +1016,50 @@
 			// perform prepass to compensate for over/undersizing
 			frames = 0;
 
+			if (codec->config.use_alt_curve)
+			{
+				twopass->alt_curve_low = twopass->average_frame - twopass->average_frame * (double)codec->config.alt_curve_low_dist / 100.0;
+				twopass->alt_curve_low_diff = twopass->average_frame - twopass->alt_curve_low;
+				twopass->alt_curve_high = twopass->average_frame + twopass->average_frame * (double)codec->config.alt_curve_high_dist / 100.0;
+				twopass->alt_curve_high_diff = twopass->alt_curve_high - twopass->average_frame;
+				if (codec->config.alt_curve_use_auto)
+				{
+					if (twopass->movie_curve > 1.0f)
+					{
+						codec->config.alt_curve_min_rel_qual = (int)(100.0 - (100.0 - 100.0 / twopass->movie_curve) * (double)codec->config.alt_curve_auto_str / 100.0);
+						if (codec->config.alt_curve_min_rel_qual < 20)
+							codec->config.alt_curve_min_rel_qual = 20;
+					}
+					else
+						codec->config.alt_curve_min_rel_qual = 100;
+				}
+				twopass->alt_curve_mid_qual = (1.0 + (double)codec->config.alt_curve_min_rel_qual / 100.0) / 2.0;
+				twopass->alt_curve_qual_dev = 1.0 - twopass->alt_curve_mid_qual;
+				if (codec->config.alt_curve_low_dist > 100)
+				{
+					switch(codec->config.alt_curve_type)
+					{
+					case 2: // Sine Curve (high aggressiveness)
+						twopass->alt_curve_qual_dev *= 2.0 / (1.0 + 
+							sin(DEG2RAD * (twopass->average_frame * 90.0 / twopass->alt_curve_low_diff)));
+						twopass->alt_curve_mid_qual = 1.0 - twopass->alt_curve_qual_dev *
+							sin(DEG2RAD * (twopass->average_frame * 90.0 / twopass->alt_curve_low_diff));
+						break;
+					case 1: // Linear (medium aggressiveness)
+						twopass->alt_curve_qual_dev *= 2.0 / (1.0 +
+							twopass->average_frame / twopass->alt_curve_low_diff);
+						twopass->alt_curve_mid_qual = 1.0 - twopass->alt_curve_qual_dev *
+							twopass->average_frame / twopass->alt_curve_low_diff;
+						break;
+					case 0: // Cosine Curve (low aggressiveness)
+						twopass->alt_curve_qual_dev *= 2.0 / (1.0 + 
+							(1.0 - cos(DEG2RAD * (twopass->average_frame * 90.0 / twopass->alt_curve_low_diff))));
+						twopass->alt_curve_mid_qual = 1.0 - twopass->alt_curve_qual_dev *
+							(1.0 - cos(DEG2RAD * (twopass->average_frame * 90.0 / twopass->alt_curve_low_diff)));
+					}
+				}
+			}
+
 			while (1)
 			{
 				if (!ReadFile(twopass->stats1, &twopass->nns1, sizeof(NNSTATS), &read, NULL) || read != sizeof(NNSTATS))
@@ -922,7 +1074,7 @@
 					{
 						CloseHandle(twopass->stats1);
 						twopass->stats1 = INVALID_HANDLE_VALUE;
-						DEBUG("2pass init error - incomplete stats2 record?");
+						DEBUGERR("2pass init error - incomplete stats2 record?");
 						return ICERR_ERROR;
 					}
 				}
@@ -933,15 +1085,65 @@
 					double dbytes = twopass->nns1.bytes / twopass->movie_curve;
 					total1 += dbytes;
 
-					if (dbytes > twopass->average_frame)
+					if (codec->config.use_alt_curve)
 					{
-						total2 += ((double)dbytes + (twopass->average_frame - dbytes) *
-							codec->config.curve_compression_high / 100.0);
+						if (dbytes > twopass->average_frame)
+						{
+							if (dbytes >= twopass->alt_curve_high)
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev);
+							else
+							{
+								switch(codec->config.alt_curve_type)
+								{
+								case 2:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									sin(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_high_diff)));
+									break;
+								case 1:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									(dbytes - twopass->average_frame) / twopass->alt_curve_high_diff);
+									break;
+								case 0:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									(1.0 - cos(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_high_diff))));
+								}
+							}
+						}
+						else
+						{
+							if (dbytes <= twopass->alt_curve_low)
+								total2 += dbytes;
+							else
+							{
+								switch(codec->config.alt_curve_type)
+								{
+								case 2:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									sin(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_low_diff)));
+									break;
+								case 1:
+								total2 += dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+									(dbytes - twopass->average_frame) / twopass->alt_curve_low_diff);
+									break;
+								case 0:
+								total2 += dbytes * (twopass->alt_curve_mid_qual + twopass->alt_curve_qual_dev *
+									(1.0 - cos(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_low_diff))));
+								}
+							}
+						}
 					}
 					else
 					{
-						total2 += ((double)dbytes + (twopass->average_frame - dbytes) *
-							codec->config.curve_compression_low / 100.0);
+						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);
+						}
 					}
 				}
 
@@ -950,6 +1152,7 @@
 
 			twopass->curve_comp_scale = total1 / total2;
 
+			if (!codec->config.use_alt_curve)
 			{
 				int asymmetric_average_frame;
 				char s[100];
@@ -962,6 +1165,15 @@
 			SetFilePointer(twopass->stats1, sizeof(DWORD), 0, FILE_BEGIN);
 		}
 
+		if (codec->config.use_alt_curve)
+		{
+			if (codec->config.alt_curve_use_auto_bonus_bias)
+				codec->config.alt_curve_bonus_bias = codec->config.alt_curve_min_rel_qual;
+
+			twopass->curve_bias_bonus = (total1 - total2) * (double)codec->config.alt_curve_bonus_bias / 100.0 / (double)(frames - credits_frames - i_frames);
+			twopass->curve_comp_scale = ((total1 - total2) * (1.0 - (double)codec->config.alt_curve_bonus_bias / 100.0) + total2) / total2;
+		}
+
 		twopass->overflow = 0;
 
 		break;
@@ -989,7 +1201,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 +1218,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 +1227,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,7 +1256,7 @@
 		return ICERR_OK;
 
 	default:
-		DEBUG("get quant: invalid mode");
+		DEBUGERR("get quant: invalid mode");
 		return ICERR_ERROR;
 	}
 }
@@ -1078,14 +1290,14 @@
 
 	if (ReadFile(twopass->stats1, &twopass->nns1, sizeof(NNSTATS), &read, 0) == 0 || read != sizeof(NNSTATS)) 
 	{
-		DEBUG("2ndpass quant: couldn't read from stats1");
+		DEBUGERR("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");
+			DEBUGERR("2ndpass quant: couldn't read from stats2");
 			return ICERR_ERROR;	
 		}
 	}
@@ -1181,7 +1393,66 @@
 
 		curve_comp_error -= bytes2;
 
-		if ((codec->config.curve_compression_high + codec->config.curve_compression_low) &&
+		if (codec->config.use_alt_curve)
+		{
+			if (!frame->intra)
+			{
+				if (dbytes > twopass->average_frame)
+				{
+					if (dbytes >= twopass->alt_curve_high)
+						curve_temp = dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev);
+					else
+					{
+						switch(codec->config.alt_curve_type)
+						{
+						case 2:
+						curve_temp = dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+							sin(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_high_diff)));
+							break;
+						case 1:
+						curve_temp = dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+							(dbytes - twopass->average_frame) / twopass->alt_curve_high_diff);
+							break;
+						case 0:
+						curve_temp = dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+							(1.0 - cos(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_high_diff))));
+						}
+					}
+				}
+				else
+				{
+					if (dbytes <= twopass->alt_curve_low)
+						curve_temp = dbytes;
+					else
+					{
+						switch(codec->config.alt_curve_type)
+						{
+						case 2:
+						curve_temp = dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+							sin(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_low_diff)));
+							break;
+						case 1:
+						curve_temp = dbytes * (twopass->alt_curve_mid_qual - twopass->alt_curve_qual_dev *
+							(dbytes - twopass->average_frame) / twopass->alt_curve_low_diff);
+							break;
+						case 0:
+						curve_temp = dbytes * (twopass->alt_curve_mid_qual + twopass->alt_curve_qual_dev *
+							(1.0 - cos(DEG2RAD * ((dbytes - twopass->average_frame) * 90.0 / twopass->alt_curve_low_diff))));
+						}
+					}
+				}
+				curve_temp = curve_temp * twopass->curve_comp_scale + twopass->curve_bias_bonus;
+
+				bytes2 += ((int)curve_temp);
+				curve_comp_error += curve_temp - ((int)curve_temp);
+			}
+			else
+			{
+				curve_comp_error += dbytes - ((int)dbytes);
+				bytes2 += ((int)dbytes);
+			}
+		}
+		else if ((codec->config.curve_compression_high + codec->config.curve_compression_low) &&
 			!frame->intra)
 		{
 			if (dbytes > twopass->average_frame)
@@ -1298,13 +1569,13 @@
 	}
 	else
 	{
-		if (frame->quant > codec->config.max_quant)
+		if (frame->quant > codec->config.max_pquant)
 		{
-			frame->quant = codec->config.max_quant;
+			frame->quant = codec->config.max_pquant;
 		}
-		if (frame->quant < codec->config.min_quant)
+		if (frame->quant < codec->config.min_pquant)
 		{
-			frame->quant = codec->config.min_quant;
+			frame->quant = codec->config.min_pquant;
 		}
 
 		// subsequent frame quants can only be +- 2
@@ -1325,6 +1596,12 @@
 
 	last_quant = frame->quant;
 
+	if (codec->config.quant_type == QUANT_MODE_MOD)
+	{
+		frame->general |= (frame->quant < 4) ? XVID_MPEGQUANT : XVID_H263QUANT;
+		frame->general &= (frame->quant < 4) ? ~XVID_H263QUANT : ~XVID_MPEGQUANT;
+	}
+
 	return ICERR_OK;
 }
 
@@ -1335,12 +1612,17 @@
 
 	NNSTATS nns1;
 	DWORD wrote;
+	char* quant_type;
 
 	if (codec->framenum == 0)
 	{
 		total_size = 0;
 	}
-	
+
+	quant_type = (frame->general & XVID_H263QUANT) ? "H.263" :
+		((frame->general & XVID_MPEGQUANT) && (frame->general & XVID_CUSTOM_QMATRIX)) ?
+		"Cust" : "MPEG";
+
 	switch (codec->config.mode)
 	{
 	case DLG_MODE_2PASS_1 :
@@ -1363,11 +1645,12 @@
 		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)
+
+		DEBUG1ST(frame->length, (int)total_size/1024, frame->intra, frame->quant, quant_type, stats->kblks, stats->mblks)
 		
 		if (WriteFile(codec->twopass.stats1, &nns1, sizeof(NNSTATS), &wrote, 0) == 0 || wrote != sizeof(NNSTATS))
 		{
-			DEBUG("stats1: WriteFile error");
+			DEBUGERR("stats1: WriteFile error");
 			return ICERR_ERROR;	
 		}
 		break;
@@ -1375,7 +1658,7 @@
 	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))
+		DEBUG2ND(frame->quant, quant_type, frame->intra, codec->twopass.bytes1, codec->twopass.desired_bytes2, frame->length, codec->twopass.overflow, codec_is_in_credits(&codec->config, codec->framenum))
 		break;
 
 	default:
@@ -1388,11 +1671,6 @@
 
 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 +1711,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;