--- trunk/vfw/src/config.c	2002/06/23 03:59:49	235
+++ trunk/vfw/src/config.c	2002/08/18 12:12:39	380
@@ -59,13 +59,18 @@
 #include <commctrl.h>
 #include <shlobj.h>
 #include <prsht.h>
+#ifdef _SMP
+#include <pthread.h>
+#endif
+
+#include <xvid.h>	// XviD API
 
 #include "codec.h"
 #include "config.h"
-#include "xvid.h"  // cpu masks
 #include "resource.h"
 
 
+
 /* registry info structs */
 
 CONFIG reg;
@@ -86,35 +91,43 @@
 	{"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},
 	{"packed",					&reg.packed,					0},
 	{"dx50bvop",				&reg.dx50bvop,					0},
 	{"debug",					&reg.debug,						0},
-#endif BFRAMES
+	{"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
+	{"kftreshold",				&reg.kftreshold,				10},
+	{"kfreduction",				&reg.kfreduction,				30},
+// 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},
@@ -128,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},
@@ -158,6 +174,10 @@
 	xvid_init(0, 0, &init_param, NULL);
 	reg.cpu = init_param.cpu_flags;
 
+#ifdef _SMP
+	reg.num_threads = pthread_num_processors_np();
+#endif
+
 	RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey);
 
 	for (i=0 ; i<sizeof(reg_ints)/sizeof(REG_INT) ; ++i)
@@ -479,6 +499,9 @@
 	// create arrays of controls to be disabled for each mode
 	const short twopass_disable[] = {
 		IDC_KFBOOST, IDC_DUMMY2PASS, IDC_USEALT,
+// added by koepi for new curve treatment
+		IDC_KFTRESHOLD, IDC_KFREDUCTION,
+//end of koepi's additions
 		IDC_CURVECOMPH, IDC_CURVECOMPL, IDC_PAYBACK, IDC_PAYBACKBIAS, IDC_PAYBACKPROP,
 		IDC_STATS2, IDC_STATS2_BROWSE,
 	};
@@ -488,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[] = {
@@ -614,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);
@@ -634,7 +662,10 @@
 		SetDlgItemInt(hDlg, IDC_KFBOOST, config->keyframe_boost, FALSE);
 		CheckDlgButton(hDlg, IDC_DISCARD1PASS, config->discard1pass ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(hDlg, IDC_DUMMY2PASS, config->dummy2pass ? BST_CHECKED : BST_UNCHECKED);
-
+// added by koepi for new 2pass curve treatment
+		SetDlgItemInt(hDlg, IDC_KFTRESHOLD, config->kftreshold, FALSE);
+		SetDlgItemInt(hDlg, IDC_KFREDUCTION, config->kfreduction, FALSE);
+// end of koepi's additions
 		SetDlgItemInt(hDlg, IDC_CURVECOMPH, config->curve_compression_high, FALSE);
 		SetDlgItemInt(hDlg, IDC_CURVECOMPL, config->curve_compression_low, FALSE);
 		SetDlgItemInt(hDlg, IDC_PAYBACK, config->bitrate_payback_delay, FALSE);
@@ -674,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);
@@ -705,6 +739,14 @@
 		CheckRadioButton(hDlg, IDC_CPU_AUTO, IDC_CPU_FORCE, 
 			config->cpu & XVID_CPU_FORCE ? IDC_CPU_FORCE : IDC_CPU_AUTO );
 
+#ifdef _SMP
+		SetDlgItemInt(hDlg, IDC_NUMTHREADS, config->num_threads, FALSE);
+#endif
+
+#ifdef BFRAMES
+		SetDlgItemInt(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio, FALSE);
+#endif
+
 		SetDlgItemInt(hDlg, IDC_CBR_REACTIONDELAY, config->rc_reaction_delay_factor, FALSE);
 		SetDlgItemInt(hDlg, IDC_CBR_AVERAGINGPERIOD, config->rc_averaging_period, FALSE);
 		SetDlgItemInt(hDlg, IDC_CBR_BUFFER, config->rc_buffer, FALSE);
@@ -731,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);
@@ -754,6 +799,10 @@
 
 	case DLG_2PASS :
 		config->keyframe_boost = GetDlgItemInt(hDlg, IDC_KFBOOST, NULL, FALSE);
+// added by koepi for the new 2pass curve treatment
+		config->kftreshold = GetDlgItemInt(hDlg, IDC_KFTRESHOLD, NULL, FALSE);
+		config->kfreduction = GetDlgItemInt(hDlg, IDC_KFREDUCTION, NULL, FALSE);
+//end of koepi's additions
 		config->discard1pass = ISDLGSET(IDC_DISCARD1PASS);
 		config->dummy2pass = ISDLGSET(IDC_DUMMY2PASS);
 		config->curve_compression_high = GetDlgItemInt(hDlg, IDC_CURVECOMPH, NULL, FALSE);
@@ -813,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);
@@ -850,6 +902,13 @@
 		config->cpu |= ISDLGSET(IDC_CPU_3DNOWEXT) ? XVID_CPU_3DNOWEXT: 0;
 		config->cpu |= ISDLGSET(IDC_CPU_FORCE) ? XVID_CPU_FORCE : 0;
 
+#ifdef _SMP
+		config->num_threads = config_get_uint(hDlg, IDC_NUMTHREADS, config->num_threads);
+#endif
+#ifdef BFRAMES
+		config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio);
+#endif
+
 		config->rc_reaction_delay_factor = config_get_uint(hDlg, IDC_CBR_REACTIONDELAY, config->rc_reaction_delay_factor);
 		config->rc_averaging_period = config_get_uint(hDlg, IDC_CBR_AVERAGINGPERIOD, config->rc_averaging_period);
 		config->rc_buffer = config_get_uint(hDlg, IDC_CBR_BUFFER, config->rc_buffer);
@@ -1084,6 +1143,18 @@
 			SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"Medium");
 			SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"High");
 		}
+		else if (psi->page == DLG_CPU)
+		{
+#ifndef _SMP
+
+			EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS_STATIC), FALSE);
+			EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS), FALSE);
+#endif
+#ifndef BFRAMES
+			EnableWindow(GetDlgItem(hDlg, IDC_FRAMEDROP_STATIC), FALSE);
+			EnableWindow(GetDlgItem(hDlg, IDC_FRAMEDROP), FALSE);
+#endif
+		}
 
 		if (hTooltip)
 		{
@@ -1315,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);