--- trunk/xvidcore/vfw/src/config.c	2004/07/16 15:41:57	1499
+++ trunk/xvidcore/vfw/src/config.c	2004/07/18 12:45:57	1510
@@ -169,13 +169,15 @@
 } named_int_t;
 
 
-#define NO_AUDIO	5
+#define NO_AUDIO	7
 static const named_int_t audio_type_list[] = {
 	{	"MP3-CBR",		1000,	48000/1152/6					},
 	{	"MP3-VBR",		  24,	48000/1152/6					},
 	{	"OGG",	   /*?*/1000,	48000*(0.7F/1024 + 0.3F/180) 	},
 	{	"AC3",			  64,	48000/1536/6					},
 	{	"DTS",			  21,	/*?*/48000/1152/6				},
+	{	"AAC",			  21,	48000/1024/6					},
+	{	"HE-AAC",		  42,	48000/1024/6					},
 	{	"(None)",		   0,	0								},
 };
 		
@@ -255,6 +257,7 @@
 	/* 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},
@@ -937,7 +940,11 @@
 			/* step 2: calculate audio_size (kbytes)*/
 			if (audio_type!=NO_AUDIO) {
 				if (audio_mode==0) {
-					audio_size = (1000 * duration * audio_rate) / (8*1024);
+					audio_size = (int)( (1000.0 * duration * audio_rate) / (8.0*1024) );
+					SetDlgItemInt(hDlg, IDC_BITRATE_ASIZE, audio_size, TRUE);
+				}else{
+					int tmp_rate = (int)( (audio_size * 8.0 * 1024) / (1000.0 * duration) );
+					SetDlgItemInt(hDlg, IDC_BITRATE_ARATE, tmp_rate, TRUE);
 				}
 			}else{
 				audio_size = 0;
@@ -977,8 +984,8 @@
 				overhead /= 1024;
 				break;
 
-			case 3 :	/* OGM: inaccurate model */
-				overhead = (int)(0.0039F * (target_size - subtitle_size));
+			case 3 :	/* alexnoe formula */
+				overhead = (int)( (target_size - subtitle_size) * (28.0/4224.0 + (1.0/255.0)) );
 				break;
 
 			default	:	/* (none) */
@@ -1135,6 +1142,7 @@
 	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);
@@ -1317,6 +1325,7 @@
 	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);
@@ -1401,6 +1410,7 @@
 			switch (LOWORD(wParam))
 			{
 			case IDC_INTERLACING :
+			case IDC_VHQ_BFRAME :
 			case IDC_BVOP :
 			case IDC_ZONE_MODE_WEIGHT :
 			case IDC_ZONE_MODE_QUANT :