--- trunk/xvidcore/vfw/src/config.c	2004/07/13 12:22:46	1490
+++ trunk/xvidcore/vfw/src/config.c	2005/01/10 02:59:38	1590
@@ -104,7 +104,7 @@
 /* MPEG-4 PROFILES/LEVELS ============================================================== */
 /* ===================================================================================== */
 
-
+#define DXN_PROFILES
 
 /* default vbv_occupancy is (64/170)*vbv_buffer_size */
 
@@ -257,8 +257,8 @@
 	/* motion */
 	{"motion_search",			&reg.motion_search,				6},
 	{"vhq_mode",				&reg.vhq_mode,					1},
+	{"vhq_bframe",				&reg.vhq_bframe,				0},
 	{"chromame",				&reg.chromame,					1},
-	{"cartoon_mode",			&reg.cartoon_mode,				0},
 	{"turbo",					&reg.turbo,						0},
 	{"max_key_interval",		&reg.max_key_interval,			300},
 	{"frame_drop_ratio",		&reg.frame_drop_ratio,			0},
@@ -289,7 +289,7 @@
 };
 
 static const REG_STR reg_strs[] = {
-	{"profile",					reg.profile_name,				"AS @ L5"},
+	{"profile",					reg.profile_name,				"(unrestricted)"},
 	{"stats",					reg.stats,						CONFIG_2PASS_FILE},
 };
 
@@ -304,6 +304,7 @@
 	{"zone%i_greyscale",		&stmp.greyscale,				0},
 	{"zone%i_chroma_opt",		&stmp.chroma_opt,				0},
 	{"zone%i_bvop_threshold",   &stmp.bvop_threshold,			0},
+	{"zone%i_cartoon_mode",		&stmp.cartoon_mode,				0},
 };
 
 static const BYTE default_qmatrix_intra[] = {
@@ -939,8 +940,13 @@
 			/* step 2: calculate audio_size (kbytes)*/
 			if (audio_type!=NO_AUDIO) {
 				if (audio_mode==0) {
-					audio_size = (int)( (1000.0 * duration * audio_rate) / (8.0*1024) );
-					SetDlgItemInt(hDlg, IDC_BITRATE_ASIZE, audio_size, TRUE);
+					int new_audio_size = (int)( (1000.0 * duration * audio_rate) / (8.0*1024) );
+					
+					/* this check is needed to avoid a loop */
+					if (new_audio_size!=audio_size) {
+						audio_size = new_audio_size;
+						SetDlgItemInt(hDlg, IDC_BITRATE_ASIZE, new_audio_size, TRUE);
+					}
 				}else{
 					int tmp_rate = (int)( (audio_size * 8.0 * 1024) / (1000.0 * duration) );
 					SetDlgItemInt(hDlg, IDC_BITRATE_ARATE, tmp_rate, TRUE);
@@ -1135,14 +1141,16 @@
 		CheckDlgButton(hDlg, IDC_ZONE_GREYSCALE, config->zones[config->cur_zone].greyscale);
 		CheckDlgButton(hDlg, IDC_ZONE_CHROMAOPT, config->zones[config->cur_zone].chroma_opt);
 
+		CheckDlg(hDlg, IDC_CARTOON, config->zones[config->cur_zone].cartoon_mode);
+
 		SetDlgItemInt(hDlg, IDC_ZONE_BVOPTHRESHOLD, config->zones[config->cur_zone].bvop_threshold, TRUE);
 		break;
 
 	case IDD_MOTION :
 		SendDlgItemMessage(hDlg, IDC_MOTION, CB_SETCURSEL, config->motion_search, 0);
 		SendDlgItemMessage(hDlg, IDC_VHQ, CB_SETCURSEL, config->vhq_mode, 0);
+		CheckDlg(hDlg, IDC_VHQ_BFRAME, config->vhq_bframe);
 		CheckDlg(hDlg, IDC_CHROMAME, config->chromame);
-		CheckDlg(hDlg, IDC_CARTOON, config->cartoon_mode);
 		CheckDlg(hDlg, IDC_TURBO, config->turbo);
 		SetDlgItemInt(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio, FALSE);
 		SetDlgItemInt(hDlg, IDC_MAXKEY, config->max_key_interval, FALSE);
@@ -1318,13 +1326,14 @@
 		config->zones[config->cur_zone].chroma_opt = IsDlgButtonChecked(hDlg, IDC_ZONE_CHROMAOPT);
 
 		config->zones[config->cur_zone].bvop_threshold = config_get_int(hDlg, IDC_ZONE_BVOPTHRESHOLD, config->zones[config->cur_zone].bvop_threshold);
+		config->zones[config->cur_zone].cartoon_mode = IsDlgChecked(hDlg, IDC_CARTOON);
 		break;
 
 	case IDD_MOTION :
 		config->motion_search = SendDlgItemMessage(hDlg, IDC_MOTION, CB_GETCURSEL, 0, 0);
 		config->vhq_mode = SendDlgItemMessage(hDlg, IDC_VHQ, CB_GETCURSEL, 0, 0);
+		config->vhq_bframe = IsDlgButtonChecked(hDlg, IDC_VHQ_BFRAME);
 		config->chromame = IsDlgChecked(hDlg, IDC_CHROMAME);
-		config->cartoon_mode = IsDlgChecked(hDlg, IDC_CARTOON);
 		config->turbo = IsDlgChecked(hDlg, IDC_TURBO);
 
 		config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio);
@@ -1407,6 +1416,7 @@
 			switch (LOWORD(wParam))
 			{
 			case IDC_INTERLACING :
+			case IDC_VHQ_BFRAME :
 			case IDC_BVOP :
 			case IDC_ZONE_MODE_WEIGHT :
 			case IDC_ZONE_MODE_QUANT :
@@ -2092,6 +2102,61 @@
 }
 
 
+/* ===================================================================================== */
+/* LICENSE DIALOG ====================================================================== */
+/* ===================================================================================== */
+
+static BOOL CALLBACK license_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uMsg)
+	{
+	case WM_INITDIALOG :
+		{
+			HRSRC hRSRC;
+			HGLOBAL hGlobal = NULL;
+			if ((hRSRC = FindResource(g_hInst, MAKEINTRESOURCE(IDR_GPL), "TEXT"))) {
+				if ((hGlobal = LoadResource(g_hInst, hRSRC))) {
+					LPVOID lpData;
+					if ((lpData = LockResource(hGlobal))) {
+						SendDlgItemMessage(hDlg, IDC_LICENSE_TEXT, WM_SETFONT, (WPARAM)GetStockObject(ANSI_FIXED_FONT), MAKELPARAM(TRUE, 0));
+						SetDlgItemText(hDlg, IDC_LICENSE_TEXT, lpData);
+						SendDlgItemMessage(hDlg, IDC_LICENSE_TEXT, EM_SETSEL, (WPARAM)-1, (LPARAM)0);
+					}
+				}
+			}
+			SetWindowLong(hDlg, GWL_USERDATA, (LONG)hGlobal);
+		}
+		break;
+
+	case WM_DESTROY :
+		{
+			HGLOBAL hGlobal = (HGLOBAL)GetWindowLong(hDlg, GWL_USERDATA);
+			if (hGlobal) {
+				FreeResource(hGlobal);
+			}
+		}
+		break;
+
+	case WM_COMMAND :
+		if (HIWORD(wParam) == BN_CLICKED) {
+			switch(LOWORD(wParam)) {
+			case IDOK :
+			case IDCANCEL :
+				EndDialog(hDlg, 0);
+				break;
+			default :
+				return 0;
+			}
+			break;
+		}
+		break;
+
+	default :
+		return 0;
+	}
+
+	return 1;
+}
 
 /* ===================================================================================== */
 /* ABOUT DIALOG ======================================================================== */
@@ -2159,12 +2224,11 @@
 		return 0;
 
 	case WM_COMMAND :
-		if (LOWORD(wParam) == IDC_WEBSITE && HIWORD(wParam) == STN_CLICKED)
-		{
+		if (LOWORD(wParam) == IDC_WEBSITE && HIWORD(wParam) == STN_CLICKED)	{
 			ShellExecute(hDlg, "open", XVID_WEBSITE, NULL, NULL, SW_SHOWNORMAL);
-		}
-		else if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
-		{
+		}else if (LOWORD(wParam) == IDC_LICENSE) {
+			DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_LICENSE), hDlg, license_proc, (LPARAM)0);
+		} else if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) {
 			EndDialog(hDlg, LOWORD(wParam));
 		}
 		break;