--- trunk/vfw/src/config.c	2002/07/27 21:38:19	343
+++ trunk/vfw/src/config.c	2002/08/18 12:12:39	380
@@ -63,9 +63,10 @@
 #include <pthread.h>
 #endif
 
+#include <xvid.h>	// XviD API
+
 #include "codec.h"
 #include "config.h"
-#include "xvid.h"  // cpu masks
 #include "resource.h"
 
 
@@ -90,6 +91,9 @@
 	{"min_key_interval",		&reg.min_key_interval,			1},
 	{"lum_masking",				&reg.lum_masking,				0},
 	{"interlacing",				&reg.interlacing,				0},
+//added by koepi for gruel's greyscale_mode
+	{"greyscale",				&reg.greyscale,					0},
+// end of koepi's additions
 #ifdef BFRAMES
 	{"max_bframes",				&reg.max_bframes,				-1},
 	{"bquant_ratio",			&reg.bquant_ratio,				200},
@@ -99,13 +103,13 @@
 	{"frame_drop_ratio",		&reg.frame_drop_ratio,			0},
 #endif
 
-	{"min_iquant",				&reg.min_iquant,				1},
+	{"min_iquant",				&reg.min_iquant,				2},
 	{"max_iquant",				&reg.max_iquant,				31},
-	{"min_pquant",				&reg.min_pquant,				1},
+	{"min_pquant",				&reg.min_pquant,				2},
 	{"max_pquant",				&reg.max_pquant,				31},
 
 	{"desired_size",			&reg.desired_size,				570000},
-	{"keyframe_boost",			&reg.keyframe_boost,			20},
+	{"keyframe_boost",			&reg.keyframe_boost,			0},
 	{"discard1pass",			&reg.discard1pass,				1},
 	{"dummy2pass",				&reg.dummy2pass,				0},
 // added by koepi for new two-pass curve treatment
@@ -114,16 +118,16 @@
 // end of koepi's additions
 	{"curve_compression_high",	&reg.curve_compression_high,	25},
 	{"curve_compression_low",	&reg.curve_compression_low,		10},
-	{"use_alt_curve",			&reg.use_alt_curve,				0},
+	{"use_alt_curve",			&reg.use_alt_curve,				1},
 	{"alt_curve_use_auto",		&reg.alt_curve_use_auto,		1},
-	{"alt_curve_auto_str",		&reg.alt_curve_auto_str,		50},
+	{"alt_curve_auto_str",		&reg.alt_curve_auto_str,		30},
 	{"alt_curve_use_auto_bonus_bias",	&reg.alt_curve_use_auto_bonus_bias,	1},
 	{"alt_curve_bonus_bias",	&reg.alt_curve_bonus_bias,		50},
 	{"alt_curve_type",			&reg.alt_curve_type,			1},
-	{"alt_curve_high_dist",		&reg.alt_curve_high_dist,		300},
-	{"alt_curve_low_dist",		&reg.alt_curve_low_dist,		300},
+	{"alt_curve_high_dist",		&reg.alt_curve_high_dist,		500},
+	{"alt_curve_low_dist",		&reg.alt_curve_low_dist,		90},
 	{"alt_curve_min_rel_qual",	&reg.alt_curve_min_rel_qual,	50},
-	{"bitrate_payback_delay",	&reg.bitrate_payback_delay,		240},
+	{"bitrate_payback_delay",	&reg.bitrate_payback_delay,		250},
 	{"bitrate_payback_method",	&reg.bitrate_payback_method,	0},
 	{"twopass_max_bitrate",		&reg.twopass_max_bitrate,		10000 * CONFIG_KBPS},
 	{"twopass_max_overflow_improvement", &reg.twopass_max_overflow_improvement, 60},
@@ -137,6 +141,9 @@
 	{"credits_end_begin",		&reg.credits_end_begin,			0},
 	{"credits_end_end",			&reg.credits_end_end,			0},
 
+// added by koepi for greyscale credits
+	{"credits_greyscale",		&reg.credits_greyscale,			0},
+// end of koepi's addition
 	{"credits_mode",			&reg.credits_mode,				0},
 	{"credits_rate",			&reg.credits_rate,				20},
 	{"credits_quant_i",			&reg.credits_quant_i,			20},
@@ -504,21 +511,23 @@
 		IDC_CREDITS_START, IDC_CREDITS_END, IDC_CREDITS_START_BEGIN, IDC_CREDITS_START_END,
 		IDC_CREDITS_END_BEGIN, IDC_CREDITS_END_END, IDC_CREDITS_RATE_RADIO,
 		IDC_CREDITS_QUANT_RADIO, IDC_CREDITS_QUANT_STATIC, IDC_CREDITS_SIZE_RADIO,
-		IDC_CREDITS_END_STATIC, IDC_CREDITS_RATE, IDC_CREDITS_QUANTI, IDC_CREDITS_QUANTP,
-		IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE,
+		IDC_CREDITS_QUANTI, IDC_CREDITS_QUANTP, IDC_CREDITS_END_STATIC, IDC_CREDITS_RATE,
+		IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, IDC_CREDITS_GREYSCALE, IDC_HINTFILE
 	};
 
 	const short qual_disable[] = {
 		IDC_STATS1, IDC_STATS1_BROWSE, IDC_DISCARD1PASS, IDC_HINTEDME,
 		IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER,
-		IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE
+		IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE,
+		IDC_HINTFILE
 	};
 
 	const short quant_disable[] = {
 		IDC_STATS1, IDC_STATS1_BROWSE, IDC_DISCARD1PASS, IDC_HINTEDME,
 		IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER,
 		IDC_MINIQUANT, IDC_MAXIQUANT, IDC_MINPQUANT, IDC_MAXPQUANT,
-		IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE
+		IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE,
+		IDC_HINTFILE
 	};
 
 	const short twopass1_disable[] = {
@@ -630,6 +639,9 @@
 		SetDlgItemInt(hDlg, IDC_MINKEY, config->min_key_interval, FALSE);
 		CheckDlgButton(hDlg, IDC_LUMMASK, config->lum_masking ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(hDlg, IDC_INTERLACING, config->interlacing ? BST_CHECKED : BST_UNCHECKED);
+// added by koepi for gruel's greyscale_mode
+		CheckDlgButton(hDlg, IDC_GREYSCALE, config->greyscale ? BST_CHECKED : BST_UNCHECKED);
+// end of koepi's addition
 #ifdef BFRAMES
 		SetDlgItemInt(hDlg, IDC_MAXBFRAMES, config->max_bframes, TRUE);
 		SetDlgItemInt(hDlg, IDC_BQUANTRATIO, config->bquant_ratio, FALSE);
@@ -693,6 +705,9 @@
 		SetDlgItemInt(hDlg, IDC_CREDITS_END_BEGIN, config->credits_end_begin, FALSE);
 		SetDlgItemInt(hDlg, IDC_CREDITS_END_END, config->credits_end_end, FALSE);
 
+// added by koepi for credits greyscale
+		CheckDlgButton(hDlg, IDC_CREDITS_GREYSCALE, config->credits_greyscale ? BST_CHECKED : BST_UNCHECKED);
+// end of koepi's addition
 		SetDlgItemInt(hDlg, IDC_CREDITS_RATE, config->credits_rate, FALSE);
 		SetDlgItemInt(hDlg, IDC_CREDITS_QUANTI, config->credits_quant_i, FALSE);
 		SetDlgItemInt(hDlg, IDC_CREDITS_QUANTP, config->credits_quant_p, FALSE);
@@ -758,6 +773,9 @@
 		config->min_key_interval = config_get_uint(hDlg, IDC_MINKEY, config->min_key_interval);
 		config->lum_masking = ISDLGSET(IDC_LUMMASK);
 		config->interlacing = ISDLGSET(IDC_INTERLACING);
+// added by koepi for gruel's greyscale_mode
+		config->greyscale = ISDLGSET(IDC_GREYSCALE);
+// end of koepi's addition
 #ifdef BFRAMES
 		config->max_bframes = config_get_int(hDlg, IDC_MAXBFRAMES, config->max_bframes);
 		config->bquant_ratio = config_get_uint(hDlg, IDC_BQUANTRATIO, config->bquant_ratio);
@@ -844,6 +862,9 @@
 		config->credits_end_begin = config_get_uint(hDlg, IDC_CREDITS_END_BEGIN, config->credits_end_begin);
 		config->credits_end_end = config_get_uint(hDlg, IDC_CREDITS_END_END, config->credits_end_end);
 
+// added by koepi for gruel's greyscale_mode
+		config->credits_greyscale = ISDLGSET(IDC_CREDITS_GREYSCALE);
+// end of koepi's addition
 		config->credits_rate = config_get_uint(hDlg, IDC_CREDITS_RATE, config->credits_rate);
 		config->credits_quant_i = config_get_uint(hDlg, IDC_CREDITS_QUANTI, config->credits_quant_i);
 		config->credits_quant_p = config_get_uint(hDlg, IDC_CREDITS_QUANTP, config->credits_quant_p);
@@ -1365,6 +1386,7 @@
 			LOGFONT lfData;
 
 			SetDlgItemText(hDlg, IDC_BUILD, XVID_BUILD);
+			SetDlgItemText(hDlg, IDC_SPECIAL_BUILD, XVID_SPECIAL_BUILD);
 
 			init_param.cpu_flags = XVID_CPU_CHKONLY;
 			xvid_init(NULL, 0, &init_param, 0);