--- branches/dev-api-4/xvidcore/vfw/src/config.c 2003/06/13 11:52:14 1069 +++ branches/dev-api-4/xvidcore/vfw/src/config.c 2003/12/01 13:16:43 1234 @@ -108,9 +108,9 @@ { /* name p@l, w h fps obj Tvmv vmv vcv ac% vbv pkt kbps flags */ { "Simple @ L0", 0x08, 176, 144, 15, 1, 198, 99, 1485, 100, 10*16368, 2048, 64, 0 }, - /* simple@l0: max f_code=1, intra_dc_vlc_threshold=0 - /* if ac preidition is used, adaptive quantization must not be used */ - /* <=qcif must be used */ + /* simple@l0: max f_code=1, intra_dc_vlc_threshold=0 */ + /* if ac preidition is used, adaptive quantization must not be used */ + /* <=qcif must be used */ { "Simple @ L1", 0x01, 176, 144, 15, 4, 198, 99, 1485, 100, 10*16368, 2048, 64, PROFILE_ADAPTQUANT }, { "Simple @ L2", 0x02, 352, 288, 15, 4, 792, 396, 5940, 100, 40*16368, 4096, 128, PROFILE_ADAPTQUANT }, { "Simple @ L3", 0x03, 352, 288, 15, 4, 792, 396, 11880, 100, 40*16368, 8192, 384, PROFILE_ADAPTQUANT }, @@ -179,12 +179,10 @@ /* 2pass2 */ {"keyframe_boost", ®.keyframe_boost, 0}, - {"kftreshold", ®.kftreshold, 10}, {"kfreduction", ®.kfreduction, 20}, {"curve_compression_high", ®.curve_compression_high, 0}, {"curve_compression_low", ®.curve_compression_low, 0}, - {"bitrate_payback_delay", ®.bitrate_payback_delay, 250}, - {"bitrate_payback_method", ®.bitrate_payback_method, XVID_PAYBACK_BIAS }, + {"overflow_control_strength", ®.overflow_control_strength, 10}, {"twopass_max_overflow_improvement", ®.twopass_max_overflow_improvement, 60}, {"twopass_max_overflow_degradation", ®.twopass_max_overflow_degradation, 60}, @@ -192,6 +190,7 @@ {"motion_search", ®.motion_search, 6}, {"vhq_mode", ®.vhq_mode, 0}, {"chromame", ®.chromame, 0}, + {"cartoon_mode", ®.cartoon_mode, 0}, {"max_key_interval", ®.max_key_interval, 300}, {"min_key_interval", ®.min_key_interval, 1}, {"frame_drop_ratio", ®.frame_drop_ratio, 0}, @@ -790,17 +789,15 @@ case IDD_RC_2PASS2 : SetDlgItemText(hDlg, IDC_STATS, config->stats); SetDlgItemInt(hDlg, IDC_KFBOOST, config->keyframe_boost, FALSE); - SetDlgItemInt(hDlg, IDC_KFTRESHOLD, config->kftreshold, FALSE); 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); - 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)); + SetDlgItemInt(hDlg, IDC_MINKEY, config->min_key_interval, FALSE); break; case IDD_ZONE : @@ -823,9 +820,9 @@ SendDlgItemMessage(hDlg, IDC_MOTION, CB_SETCURSEL, config->motion_search, 0); SendDlgItemMessage(hDlg, IDC_VHQ, CB_SETCURSEL, config->vhq_mode, 0); CheckDlg(hDlg, IDC_CHROMAME, config->chromame); + 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 : @@ -905,23 +902,23 @@ lstrcpy(config->stats, CONFIG_2PASS_FILE); config->keyframe_boost = GetDlgItemInt(hDlg, IDC_KFBOOST, NULL, FALSE); - config->kftreshold = GetDlgItemInt(hDlg, IDC_KFTRESHOLD, NULL, FALSE); 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); - 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; - - CONSTRAINVAL(config->bitrate_payback_delay, 1, 10000); - CONSTRAINVAL(config->keyframe_boost, 0, 1000); CONSTRAINVAL(config->curve_compression_high, 0, 100); CONSTRAINVAL(config->curve_compression_low, 0, 100); + + config->min_key_interval = config_get_uint(hDlg, IDC_MINKEY, config->min_key_interval); + break; case IDD_ZONE : @@ -947,11 +944,11 @@ config->motion_search = SendDlgItemMessage(hDlg, IDC_MOTION, CB_GETCURSEL, 0, 0); config->vhq_mode = SendDlgItemMessage(hDlg, IDC_VHQ, CB_GETCURSEL, 0, 0); config->chromame = IsDlgChecked(hDlg, IDC_CHROMAME); + config->cartoon_mode = IsDlgChecked(hDlg, IDC_CARTOON); 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 : @@ -1388,7 +1385,6 @@ case WM_NOTIFY : { NMHDR * n = (NMHDR*)lParam; - int idc = (int)wParam; if (n->code == NM_DBLCLK) { NMLISTVIEW * nmlv = (NMLISTVIEW*) lParam; @@ -1442,7 +1438,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; @@ -1599,9 +1595,9 @@ info.version = XVID_VERSION; xvid_global(0, XVID_GBL_INFO, &info, NULL); wsprintf(core, "libxvidcore version %d.%d.%d (\"%s\")", - XVID_MAJOR(info.actual_version), - XVID_MINOR(info.actual_version), - XVID_PATCH(info.actual_version), + XVID_VERSION_MAJOR(info.actual_version), + XVID_VERSION_MINOR(info.actual_version), + XVID_VERSION_PATCH(info.actual_version), info.build); SetDlgItemText(hDlg, IDC_CORE, core);