--- trunk/vfw/src/config.c 2002/07/12 12:26:55 295 +++ trunk/vfw/src/config.c 2002/07/27 21:38:19 343 @@ -96,6 +96,7 @@ {"packed", ®.packed, 0}, {"dx50bvop", ®.dx50bvop, 0}, {"debug", ®.debug, 0}, + {"frame_drop_ratio", ®.frame_drop_ratio, 0}, #endif {"min_iquant", ®.min_iquant, 1}, @@ -107,6 +108,10 @@ {"keyframe_boost", ®.keyframe_boost, 20}, {"discard1pass", ®.discard1pass, 1}, {"dummy2pass", ®.dummy2pass, 0}, +// added by koepi for new two-pass curve treatment + {"kftreshold", ®.kftreshold, 10}, + {"kfreduction", ®.kfreduction, 30}, +// end of koepi's additions {"curve_compression_high", ®.curve_compression_high, 25}, {"curve_compression_low", ®.curve_compression_low, 10}, {"use_alt_curve", ®.use_alt_curve, 0}, @@ -487,6 +492,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, }; @@ -642,7 +650,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); @@ -717,6 +728,10 @@ SetDlgItemInt(hDlg, IDC_NUMTHREADS, config->num_threads, FALSE); #endif +#ifdef BFRAMES + SetDlgItemInt(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio, FALSE); +#endif + 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); @@ -766,6 +781,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); @@ -865,6 +884,9 @@ #ifdef _SMP config->num_threads = config_get_uint(hDlg, IDC_NUMTHREADS, config->num_threads); #endif +#ifdef BFRAMES + config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio); +#endif 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); @@ -1100,13 +1122,18 @@ SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"Medium"); SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"High"); } -#ifndef _SMP else if (psi->page == DLG_CPU) { +#ifndef _SMP + EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS_STATIC), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS), FALSE); - } #endif +#ifndef BFRAMES + EnableWindow(GetDlgItem(hDlg, IDC_FRAMEDROP_STATIC), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_FRAMEDROP), FALSE); +#endif + } if (hTooltip) {