--- branches/dev-api-4/xvidcore/vfw/src/config.c	2003/11/09 20:49:21	1202
+++ branches/dev-api-4/xvidcore/vfw/src/config.c	2003/12/17 15:16:16	1267
@@ -165,6 +165,7 @@
 	{"bquant_offset",			&reg.bquant_offset,				100},   /* 100-base float */
 	{"packed",					&reg.packed,					0},
 	{"closed_gov",				&reg.closed_gov,				1},
+	{"aspect_ratio",			&reg.display_aspect_ratio,		0},
 
     /* zones */
     {"num_zones",               &reg.num_zones,                 1},
@@ -180,6 +181,7 @@
     /* 2pass2 */
 	{"keyframe_boost",			&reg.keyframe_boost,			0},
 	{"kfreduction",				&reg.kfreduction,				20},
+	{"kfthreshold",				&reg.kfthreshold,				1},
 	{"curve_compression_high",	&reg.curve_compression_high,	0},
 	{"curve_compression_low",	&reg.curve_compression_low,		0},
 	{"overflow_control_strength", &reg.overflow_control_strength, 10},
@@ -192,7 +194,6 @@
     {"chromame",				&reg.chromame,					0},
     {"cartoon_mode",			&reg.cartoon_mode,				0},
 	{"max_key_interval",		&reg.max_key_interval,			300},
-	{"min_key_interval",		&reg.min_key_interval,			1},
 	{"frame_drop_ratio",		&reg.frame_drop_ratio,			0},	
 	
     /* quant */
@@ -625,6 +626,14 @@
 		SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"H.263");
 		SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"MPEG");
 		SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"MPEG-Custom");
+
+		SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_ADDSTRING, 0, (LPARAM)"1:1 (Default)");
+		SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_ADDSTRING, 0, (LPARAM)"4:3 (Anamorph)");
+		SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_ADDSTRING, 0, (LPARAM)"16:9 (Anamorph)");
+		/* reserved for future use if acceptance is there for DAR */
+#if 0
+		SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_ADDSTRING, 0, (LPARAM)"Custom");
+#endif		
         break;
         
     case IDD_LEVEL :
@@ -769,6 +778,7 @@
 		set_dlgitem_float(hDlg, IDC_BQUANTOFFSET, config->bquant_offset);
         CheckDlg(hDlg, IDC_PACKED, config->packed);
 		CheckDlg(hDlg, IDC_CLOSEDGOV, config->closed_gov);
+        SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_SETCURSEL, (config->display_aspect_ratio), 0);
 		break;
 
     case IDD_LEVEL :
@@ -789,24 +799,15 @@
 	case IDD_RC_2PASS2 :
 		SetDlgItemText(hDlg, IDC_STATS, config->stats);
         SetDlgItemInt(hDlg, IDC_KFBOOST, config->keyframe_boost, FALSE);
-#if defined(REMOVE_ME)
-		SetDlgItemInt(hDlg, IDC_KFTRESHOLD, config->kftreshold, FALSE);
-#endif
 		SetDlgItemInt(hDlg, IDC_KFREDUCTION, config->kfreduction, FALSE);
 
+		SetDlgItemInt(hDlg, IDC_OVERFLOW_CONTROL_STRENGTH, config->overflow_control_strength, FALSE);
         SetDlgItemInt(hDlg, IDC_OVERIMP, config->twopass_max_overflow_improvement, FALSE);
 		SetDlgItemInt(hDlg, IDC_OVERDEG, config->twopass_max_overflow_degradation, FALSE);
 
 		SetDlgItemInt(hDlg, IDC_CURVECOMPH, config->curve_compression_high, FALSE);
 		SetDlgItemInt(hDlg, IDC_CURVECOMPL, config->curve_compression_low, FALSE);
-#if defined(REMOVE_ME)
-		SetDlgItemInt(hDlg, IDC_PAYBACK, config->bitrate_payback_delay, FALSE);
-		CheckDlgButton(hDlg, IDC_PAYBACKBIAS, (config->bitrate_payback_method == XVID_PAYBACK_BIAS));
-		CheckDlgButton(hDlg, IDC_PAYBACKPROP, (config->bitrate_payback_method == XVID_PAYBACK_PROP));
-#endif
-		/* TODO:
-		 * Add here the control strength code
-		 */
+		SetDlgItemInt(hDlg, IDC_MINKEY, config->kfthreshold, FALSE);
 		break;
 
     case IDD_ZONE :
@@ -832,7 +833,6 @@
         CheckDlg(hDlg, IDC_CARTOON, config->cartoon_mode);
 		SetDlgItemInt(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio, FALSE);
 		SetDlgItemInt(hDlg, IDC_MAXKEY, config->max_key_interval, FALSE);
-		SetDlgItemInt(hDlg, IDC_MINKEY, config->min_key_interval, FALSE);
         break;
         
 	case IDD_QUANT :
@@ -889,6 +889,7 @@
 		config->bquant_offset = get_dlgitem_float(hDlg, IDC_BQUANTOFFSET, config->bquant_offset);
 		config->packed = IsDlgChecked(hDlg, IDC_PACKED);
 		config->closed_gov = IsDlgChecked(hDlg, IDC_CLOSEDGOV);
+        config->display_aspect_ratio = SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_GETCURSEL, 0, 0);
 		break;
 
     case IDD_LEVEL :
@@ -912,33 +913,23 @@
 			lstrcpy(config->stats, CONFIG_2PASS_FILE);
 
         config->keyframe_boost = GetDlgItemInt(hDlg, IDC_KFBOOST, NULL, FALSE);
-#if defined(REMOVE_ME)
-		config->kftreshold = GetDlgItemInt(hDlg, IDC_KFTRESHOLD, NULL, FALSE);
-#endif
 		config->kfreduction = GetDlgItemInt(hDlg, IDC_KFREDUCTION, NULL, FALSE);
+		CONSTRAINVAL(config->keyframe_boost, 0, 1000);
 
+		config->overflow_control_strength = GetDlgItemInt(hDlg, IDC_OVERFLOW_CONTROL_STRENGTH, NULL, FALSE);
 		config->twopass_max_overflow_improvement = config_get_uint(hDlg, IDC_OVERIMP, config->twopass_max_overflow_improvement);
 		config->twopass_max_overflow_degradation = config_get_uint(hDlg, IDC_OVERDEG, config->twopass_max_overflow_degradation);
 		CONSTRAINVAL(config->twopass_max_overflow_improvement, 1, 80);
 		CONSTRAINVAL(config->twopass_max_overflow_degradation, 1, 80);
+		CONSTRAINVAL(config->overflow_control_strength, 0, 100);
 		
 		config->curve_compression_high = GetDlgItemInt(hDlg, IDC_CURVECOMPH, NULL, FALSE);
 		config->curve_compression_low = GetDlgItemInt(hDlg, IDC_CURVECOMPL, NULL, FALSE);
-#if defined(REMOVE_ME)
-		config->bitrate_payback_delay = config_get_uint(hDlg, IDC_PAYBACK, config->bitrate_payback_delay);
-        config->bitrate_payback_method = IsDlgChecked(hDlg, IDC_PAYBACKPROP) ? XVID_PAYBACK_PROP : XVID_PAYBACK_BIAS;
-#endif
-
-#if defined(REMOVE_ME)
-		CONSTRAINVAL(config->bitrate_payback_delay, 1, 10000);
-#endif
-		CONSTRAINVAL(config->keyframe_boost, 0, 1000);
 		CONSTRAINVAL(config->curve_compression_high, 0, 100);
 		CONSTRAINVAL(config->curve_compression_low, 0, 100);
 
-		/*
-		 * TODO: add the control strength code
-		 */
+		config->kfthreshold = config_get_uint(hDlg, IDC_MINKEY, config->kfthreshold);
+
 		break;
 
     case IDD_ZONE :
@@ -969,7 +960,6 @@
         config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio);
 
 		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);
 		break;
 
 	case IDD_QUANT :
@@ -1459,7 +1449,7 @@
             case IDC_BITRATE_CALC :
                 main_download(hDlg, config);
                 adv_dialog(hDlg, config, bitrate_dlgs, sizeof(bitrate_dlgs)/sizeof(int));
-                SetDlgItemInt(hDlg, IDC_BITRATE, config->bitrate, FALSE);
+                //SetDlgItemInt(hDlg, IDC_BITRATE, config->bitrate, FALSE);
                 main_mode(hDlg, config);
                 break;