--- config.c	2002/06/20 10:51:08	1.11
+++ config.c	2003/02/16 04:32:04	1.23
@@ -50,7 +50,7 @@
  *              now get Core Version use xvid_init()
  *	05.03.2002  Min Chen <chenm001@163.com>
  *				Add Core version display to about box
- *	01.12.2001	inital version; (c)2001 peter ross <suxen_drol@hotmail.com>
+ *	01.12.2001	inital version; (c)2001 peter ross <pross@xvid.org>
  *
  *************************************************************************/
 
@@ -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;
@@ -79,40 +84,55 @@
 	{"rc_averaging_period",		&reg.rc_averaging_period,		100},
 	{"rc_buffer",				&reg.rc_buffer,					100},
 
-	{"motion_search",			&reg.motion_search,				5},
+	{"motion_search",			&reg.motion_search,				6},
 	{"quant_type",				&reg.quant_type,				0},
 	{"fourcc_used",				&reg.fourcc_used,				0},
+	{"vhq_mode",				&reg.vhq_mode,					0},
 	{"max_key_interval",		&reg.max_key_interval,			300},
 	{"min_key_interval",		&reg.min_key_interval,			1},
 	{"lum_masking",				&reg.lum_masking,				0},
 	{"interlacing",				&reg.interlacing,				0},
-#ifdef BFRAMES
-	{"max_bframes",				&reg.max_bframes,				0},
-	{"bquant_ratio",			&reg.bquant_ratio,				200},
-	{"packed",					&reg.packed,					1},
-#endif BFRAMES
+	{"qpel",					&reg.qpel,						0},
+	{"gmc",						&reg.gmc,						0},
+	{"chromame",				&reg.chromame,					0},
+//added by koepi for gruel's greyscale_mode
+	{"greyscale",				&reg.greyscale,					0},
+// end of koepi's additions
+	{"max_bframes",				&reg.max_bframes,				-1},
+	{"bquant_ratio",			&reg.bquant_ratio,				150},
+	{"bquant_offset",			&reg.bquant_offset,				100},
+	{"packed",					&reg.packed,					0},
+	{"dx50bvop",				&reg.dx50bvop,					1},
+	{"debug",					&reg.debug,						0},
+	{"reduced_resolution",		&reg.reduced_resolution,		0},
+	{"chroma_opt",				&reg.chroma_opt,				0},
+	{"frame_drop_ratio",		&reg.frame_drop_ratio,			0},
 
-	{"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},
-	{"curve_compression_high",	&reg.curve_compression_high,	25},
-	{"curve_compression_low",	&reg.curve_compression_low,		10},
+// added by koepi for new two-pass curve treatment
+	{"kftreshold",				&reg.kftreshold,				10},
+	{"kfreduction",				&reg.kfreduction,				20},
+// end of koepi's additions
+	{"curve_compression_high",	&reg.curve_compression_high,	0},
+	{"curve_compression_low",	&reg.curve_compression_low,		0},
 	{"use_alt_curve",			&reg.use_alt_curve,				0},
 	{"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},
@@ -126,12 +146,19 @@
 	{"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},
 	{"credits_quant_p",			&reg.credits_quant_p,			20},
 	{"credits_start_size",		&reg.credits_start_size,		10000},
-	{"credits_end_size",		&reg.credits_end_size,			10000}
+	{"credits_end_size",		&reg.credits_end_size,			10000},
+
+	/* decoder */
+	{"deblock_y",				&reg.deblock_y,					0},
+	{"deblock_uv",				&reg.deblock_uv,				0}
 };
 
 REG_STR const reg_strs[] = {
@@ -152,9 +179,13 @@
 	XVID_INIT_PARAM init_param;
 	int i;
 
-	init_param.cpu_flags = 0;
+	init_param.cpu_flags = XVID_CPU_CHKONLY;
 	xvid_init(0, 0, &init_param, NULL);
-	config->cpu = init_param.cpu_flags;
+	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);
 
@@ -477,6 +508,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,
 	};
@@ -486,21 +520,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[] = {
@@ -512,9 +548,9 @@
 
 	const short twopass2_ext_disable[] = {
 		IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER,
-		IDC_CREDITS_RATE_RADIO, IDC_CREDITS_QUANT_RADIO, IDC_CREDITS_QUANT_STATIC,
+		IDC_CREDITS_RATE_RADIO, 
 		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_START_SIZE, IDC_CREDITS_END_SIZE
 	};
 
 	const short twopass2_int_disable[] = {
@@ -608,15 +644,26 @@
 		SendDlgItemMessage(hDlg, IDC_MOTION, CB_SETCURSEL, config->motion_search, 0);
 		SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_SETCURSEL, config->quant_type, 0);
 		SendDlgItemMessage(hDlg, IDC_FOURCC, CB_SETCURSEL, config->fourcc_used, 0);
+		SendDlgItemMessage(hDlg, IDC_VHQ, CB_SETCURSEL, config->vhq_mode, 0);
 		SetDlgItemInt(hDlg, IDC_MAXKEY, config->max_key_interval, FALSE);
 		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);
-#ifdef BFRAMES
+
+		CheckDlgButton(hDlg, IDC_QPEL, config->qpel ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hDlg, IDC_GMC, config->gmc ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hDlg, IDC_CHROMAME, config->chromame ? 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
 		SetDlgItemInt(hDlg, IDC_MAXBFRAMES, config->max_bframes, TRUE);
 		SetDlgItemInt(hDlg, IDC_BQUANTRATIO, config->bquant_ratio, FALSE);
+		SetDlgItemInt(hDlg, IDC_BQUANTOFFSET, config->bquant_offset, FALSE);
 		CheckDlgButton(hDlg, IDC_PACKED, config->packed ? BST_CHECKED : BST_UNCHECKED);
-#endif
+		CheckDlgButton(hDlg, IDC_DX50BVOP, config->dx50bvop ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hDlg, IDC_DEBUG, config->debug ? BST_CHECKED : BST_UNCHECKED);
+		
+		CheckDlgButton(hDlg, IDC_REDUCED, config->reduced_resolution ? BST_CHECKED : BST_UNCHECKED);
 		break;
 
 	case DLG_QUANT :
@@ -630,7 +677,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);
@@ -670,6 +720,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);
@@ -701,6 +754,11 @@
 		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
+		CheckDlgButton(hDlg, IDC_CHROMA_OPT, (config->chroma_opt) ? BST_CHECKED : BST_UNCHECKED);
+		SetDlgItemInt(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio, FALSE);
 		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);
@@ -723,15 +781,25 @@
 		config->motion_search = SendDlgItemMessage(hDlg, IDC_MOTION, CB_GETCURSEL, 0, 0);
 		config->quant_type = SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_GETCURSEL, 0, 0);
 		config->fourcc_used = SendDlgItemMessage(hDlg, IDC_FOURCC, CB_GETCURSEL, 0, 0);
+		config->vhq_mode = SendDlgItemMessage(hDlg, IDC_VHQ, CB_GETCURSEL, 0, 0);
 		config->max_key_interval = config_get_uint(hDlg, IDC_MAXKEY, config->max_key_interval);
 		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);
-#ifdef BFRAMES
+
+		config->qpel = ISDLGSET(IDC_QPEL);
+		config->gmc = ISDLGSET(IDC_GMC);
+		config->chromame = ISDLGSET(IDC_CHROMAME);
+// added by koepi for gruel's greyscale_mode
+		config->greyscale = ISDLGSET(IDC_GREYSCALE);
+// end of koepi's addition
 		config->max_bframes = config_get_int(hDlg, IDC_MAXBFRAMES, config->max_bframes);
 		config->bquant_ratio = config_get_uint(hDlg, IDC_BQUANTRATIO, config->bquant_ratio);
+		config->bquant_offset = config_get_uint(hDlg, IDC_BQUANTOFFSET, config->bquant_offset);
 		config->packed = ISDLGSET(IDC_PACKED);
-#endif
+		config->dx50bvop = ISDLGSET(IDC_DX50BVOP);
+		config->debug = ISDLGSET(IDC_DEBUG);
+		config->reduced_resolution = ISDLGSET(IDC_REDUCED);
 		break;
 
 	case DLG_QUANT :
@@ -748,6 +816,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);
@@ -807,6 +879,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);
@@ -844,6 +919,11 @@
 		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
+		config->chroma_opt = ISDLGSET(IDC_CHROMA_OPT);
+		config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio);
 		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);
@@ -906,6 +986,134 @@
 }
 
 
+
+/* --- decoder options dialog  --- */
+
+#define DEC_DLG_COUNT	1
+#define DEC_DLG_POSTPROC	0
+
+/* decoder dialog: upload config data */
+
+void dec_upload(HWND hDlg, int page, CONFIG * config)
+{
+	switch (page)
+	{
+	case DEC_DLG_POSTPROC :
+		CheckDlgButton(hDlg, IDC_DEBLOCK_Y,  config->deblock_y ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hDlg, IDC_DEBLOCK_UV, config->deblock_uv ? BST_CHECKED : BST_UNCHECKED);
+		break;
+	}
+}
+
+
+/* dec dialog: download config data */
+
+void dec_download(HWND hDlg, int page, CONFIG * config)
+{
+	switch (page)
+	{
+	case DEC_DLG_POSTPROC :
+		config->deblock_y = ISDLGSET(IDC_DEBLOCK_Y);
+		config->deblock_uv = ISDLGSET(IDC_DEBLOCK_UV);
+		break;
+	}
+}
+
+/* decoder dialog proc */
+
+BOOL CALLBACK dec_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	PROPSHEETINFO *psi;
+
+	psi = (PROPSHEETINFO*)GetWindowLong(hDlg, GWL_USERDATA);
+
+	switch (uMsg)
+	{
+	case WM_INITDIALOG :
+		psi = (PROPSHEETINFO*) ((LPPROPSHEETPAGE)lParam)->lParam;
+
+		SetWindowLong(hDlg, GWL_USERDATA, (LPARAM)psi);
+
+		if (hTooltip)
+		{
+			EnumChildWindows(hDlg, enum_tooltips, 0);
+		}
+
+		dec_upload(hDlg, psi->page, psi->config);
+		break;
+
+	case WM_NOTIFY :
+		switch (((NMHDR *)lParam)->code)
+		{
+		case PSN_KILLACTIVE :	
+			/* validate */
+			dec_download(hDlg, psi->page, psi->config);
+			SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
+			break;
+
+		case PSN_APPLY :
+			/* apply */
+			dec_download(hDlg, psi->page, psi->config);
+			SetWindowLong(hDlg, DWL_MSGRESULT, FALSE);
+			psi->config->save = TRUE;
+			break;
+		}
+		break;
+
+	default :
+		return 0;
+	}
+
+	return 1;
+}
+
+
+void dec_dialog(HWND hParent, CONFIG * config)
+{
+	PROPSHEETINFO psi[DEC_DLG_COUNT];
+	PROPSHEETPAGE psp[DEC_DLG_COUNT];
+	PROPSHEETHEADER psh;
+	CONFIG temp;
+	int i;
+
+	config->save = FALSE;
+	memcpy(&temp, config, sizeof(CONFIG));
+
+	for (i=0 ; i<DEC_DLG_COUNT ; ++i)
+	{
+		psp[i].dwSize = sizeof(PROPSHEETPAGE);
+		psp[i].dwFlags = 0;
+		psp[i].hInstance = hInst;
+		psp[i].pfnDlgProc = dec_proc;
+		psp[i].lParam = (LPARAM)&psi[i];
+		psp[i].pfnCallback = NULL;
+
+		psi[i].page = i;
+		psi[i].config = &temp;
+	}
+
+	psp[DEC_DLG_POSTPROC].pszTemplate = MAKEINTRESOURCE(IDD_POSTPROC);
+
+	psh.dwSize = sizeof(PROPSHEETHEADER);
+	psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW;
+	psh.hwndParent = hParent;
+	psh.hInstance = hInst;
+	psh.pszCaption = (LPSTR) "XviD Configuration";
+	psh.nPages = DEC_DLG_COUNT;
+	psh.nStartPage = DEC_DLG_POSTPROC;
+	psh.ppsp = (LPCPROPSHEETPAGE)&psp;
+	psh.pfnCallback = NULL;
+
+	PropertySheet(&psh);
+
+	if (temp.save)
+	{
+		memcpy(config, &temp, sizeof(CONFIG));
+	}
+}
+
+
+
 /* main dialog proc */
 
 BOOL CALLBACK main_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -931,9 +1139,9 @@
 
 		InitCommonControls();
 
-		if (hTooltip = CreateWindow(TOOLTIPS_CLASS, NULL, TTS_ALWAYSTIP,
+		if ((hTooltip = CreateWindow(TOOLTIPS_CLASS, NULL, TTS_ALWAYSTIP,
 				CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-				NULL, NULL, hInst, NULL))
+				NULL, NULL, hInst, NULL)))
 		{
 			SetWindowPos(hTooltip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE);
 			SendMessage(hTooltip, TTM_SETDELAYTIME, TTDT_AUTOMATIC, MAKELONG(1500, 0));
@@ -973,6 +1181,15 @@
 				config_reg_set(config);
 			}
 		}
+		else if (LOWORD(wParam) == IDC_DECODER && HIWORD(wParam) == BN_CLICKED)
+		{
+			dec_dialog(hDlg, config);
+
+			if (config->save)
+			{
+				config_reg_set(config);
+			}
+		}
 		else if (LOWORD(wParam) == IDC_DEFAULTS && HIWORD(wParam) == BN_CLICKED)
 		{
 			config_reg_default(config);
@@ -1056,19 +1273,19 @@
 			SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"MPEG");
 			SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"MPEG-Custom");
 			SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"Modulated");
+			SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"New Modulated HQ");
 
 			SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"XVID");
 			SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"DIVX");
 			SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"DX50");
 
-#ifndef BFRAMES
-			EnableWindow(GetDlgItem(hDlg, IDC_BSTATIC1), FALSE);
-			EnableWindow(GetDlgItem(hDlg, IDC_BSTATIC2), FALSE);
-			EnableWindow(GetDlgItem(hDlg, IDC_BSTATIC3), FALSE);
-			EnableWindow(GetDlgItem(hDlg, IDC_MAXBFRAMES), FALSE);
-			EnableWindow(GetDlgItem(hDlg, IDC_BQUANTRATIO), FALSE);
-			EnableWindow(GetDlgItem(hDlg, IDC_PACKED), FALSE);
-#endif
+			SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"0 - Off");
+			SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"1 - Mode Decision");
+			SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"2 - Limited Search");
+			SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"3 - Medium Search");
+			SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"4 - Wide Search");
+			/* XXX: reduced resolution is not ready for prime-time */
+			ShowWindow(GetDlgItem(hDlg, IDC_REDUCED), SW_HIDE);
 		}
 		else if (psi->page == DLG_2PASSALT)
 		{
@@ -1076,6 +1293,13 @@
 			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
+		}
 
 		if (hTooltip)
 		{
@@ -1307,7 +1531,9 @@
 			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);
 			wsprintf(core, "Core Version %d.%d", (init_param.api_version>>16),(init_param.api_version&0xFFFFU));
 			SetDlgItemText(hDlg, IDC_CORE, core);