--- trunk/vfw/src/config.c 2002/04/05 14:42:37 102 +++ trunk/vfw/src/config.c 2002/04/21 10:47:53 131 @@ -23,6 +23,11 @@ * * History: * + * 21.04.2002 fixed custom matrix support, tried to get dll size down + * 17.04.2002 re-enabled lumi masking in 1st pass + * 15.04.2002 updated cbr support + * 07.04.2002 min keyframe interval checkbox + * 2-pass max bitrate and overflow customization * 04.04.2002 interlacing support * hinted ME support * 24.03.2002 daniel smith @@ -66,15 +71,18 @@ REG_INT const reg_ints[] = { {"mode", ®.mode, DLG_MODE_CBR}, - {"bitrate", ®.bitrate, 900000}, {"quality", ®.quality, 85}, {"quant", ®.quant, 5}, - {"rc_buffersize", ®.rc_buffersize, 16}, + {"rc_bitrate", ®.rc_bitrate, 900000}, + {"rc_reaction_delay_factor",®.rc_reaction_delay_factor, 16}, + {"rc_averaging_period", ®.rc_averaging_period, 100}, + {"rc_buffer", ®.rc_buffer, 100}, {"motion_search", ®.motion_search, 5}, {"quant_type", ®.quant_type, 0}, {"fourcc_used", ®.fourcc_used, 0}, {"max_key_interval", ®.max_key_interval, 300}, + {"min_key_interval", ®.min_key_interval, 1}, {"lum_masking", ®.lum_masking, 0}, {"interlacing", ®.interlacing, 0}, @@ -85,7 +93,6 @@ {"desired_size", ®.desired_size, 570000}, {"keyframe_boost", ®.keyframe_boost, 20}, - {"min_key_interval", ®.min_key_interval, 6}, {"discard1pass", ®.discard1pass, 1}, {"dummy2pass", ®.dummy2pass, 0}, {"curve_compression_high", ®.curve_compression_high, 25}, @@ -101,6 +108,9 @@ {"alt_curve_min_rel_qual", ®.alt_curve_min_rel_qual, 50}, {"bitrate_payback_delay", ®.bitrate_payback_delay, 240}, {"bitrate_payback_method", ®.bitrate_payback_method, 0}, + {"twopass_max_bitrate", ®.twopass_max_bitrate, 10000 * CONFIG_KBPS}, + {"twopass_max_overflow_improvement", ®.twopass_max_overflow_improvement, 60}, + {"twopass_max_overflow_degradation", ®.twopass_max_overflow_degradation, 60}, {"hinted_me", ®.hinted_me, 0}, {"credits_start", ®.credits_start, 0}, @@ -283,7 +293,7 @@ { default : case DLG_MODE_CBR : - config->bitrate = config_get_int(hDlg, IDC_VALUE, config->bitrate) * CONFIG_KBPS; + config->rc_bitrate = config_get_int(hDlg, IDC_VALUE, config->rc_bitrate) * CONFIG_KBPS; break; case DLG_MODE_VBR_QUAL : @@ -300,7 +310,6 @@ } config->mode = SendDlgItemMessage(hDlg, IDC_MODE, CB_GETCURSEL, 0, 0); - config->rc_buffersize = config_get_int(hDlg, IDC_CBRBUFFER, config->rc_buffersize); } @@ -319,7 +328,7 @@ case DLG_MODE_CBR : text = "Bitrate (Kbps):"; - value = config->bitrate / CONFIG_KBPS; + value = config->rc_bitrate / CONFIG_KBPS; break; case DLG_MODE_VBR_QUAL : @@ -343,8 +352,6 @@ EnableWindow(GetDlgItem(hDlg, IDC_VALUE_STATIC), enabled); EnableWindow(GetDlgItem(hDlg, IDC_VALUE), enabled); - EnableWindow(GetDlgItem(hDlg, IDC_CBRBUFFER_STATIC), (config->mode == DLG_MODE_CBR)); - EnableWindow(GetDlgItem(hDlg, IDC_CBRBUFFER), (config->mode == DLG_MODE_CBR)); } @@ -365,7 +372,7 @@ case DLG_MODE_CBR : text = "Bitrate (Kbps):"; range = MAKELONG(0,10000); - pos = config->bitrate / CONFIG_KBPS; + pos = config->rc_bitrate / CONFIG_KBPS; break; case DLG_MODE_VBR_QUAL : @@ -452,10 +459,14 @@ void adv_mode(HWND hDlg, int mode) { // create arrays of controls to be disabled for each mode - const int cbr_disable[] = { - IDC_KFBOOST, IDC_MINKEY, IDC_DISCARD1PASS, IDC_DUMMY2PASS, + const short twopass_disable[] = { + IDC_KFBOOST, IDC_DUMMY2PASS, IDC_USEALT, IDC_CURVECOMPH, IDC_CURVECOMPL, IDC_PAYBACK, IDC_PAYBACKBIAS, IDC_PAYBACKPROP, - IDC_STATS1, IDC_STATS1_BROWSE, IDC_STATS2, IDC_STATS2_BROWSE, + IDC_STATS2, IDC_STATS2_BROWSE, + }; + + const short cbr_disable[] = { + IDC_STATS1, IDC_STATS1_BROWSE, IDC_DISCARD1PASS, IDC_HINTEDME, IDC_CREDITS_START, IDC_CREDITS_END, IDC_CREDITS_START_BEGIN, IDC_CREDITS_START_END, IDC_CREDITS_END_BEGIN, IDC_CREDITS_END_END, IDC_CREDITS_RATE_RADIO, IDC_CREDITS_QUANT_RADIO, IDC_CREDITS_QUANT_STATIC, IDC_CREDITS_SIZE_RADIO, @@ -463,92 +474,111 @@ IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, }; - const int qual_disable[] = { - IDC_KFBOOST, IDC_MINKEY, IDC_DISCARD1PASS, IDC_DUMMY2PASS, - IDC_CURVECOMPH, IDC_CURVECOMPL, IDC_PAYBACK, IDC_PAYBACKBIAS, IDC_PAYBACKPROP, - IDC_STATS1, IDC_STATS1_BROWSE, IDC_STATS2, IDC_STATS2_BROWSE, + const short qual_disable[] = { + IDC_STATS1, IDC_STATS1_BROWSE, IDC_DISCARD1PASS, IDC_HINTEDME, + IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE }; - const int quant_disable[] = { + const short quant_disable[] = { + IDC_STATS1, IDC_STATS1_BROWSE, IDC_DISCARD1PASS, IDC_HINTEDME, + IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, IDC_MINIQUANT, IDC_MAXIQUANT, IDC_MINPQUANT, IDC_MAXPQUANT, - IDC_KFBOOST, IDC_MINKEY, IDC_DISCARD1PASS, IDC_DUMMY2PASS, - IDC_CURVECOMPH, IDC_CURVECOMPL, IDC_PAYBACK, IDC_PAYBACKBIAS, IDC_PAYBACKPROP, - IDC_STATS1, IDC_STATS1_BROWSE, IDC_STATS2, IDC_STATS2_BROWSE, IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE }; - const int twopass1_disable[] = { - IDC_LUMMASK, IDC_MINIQUANT, IDC_MAXIQUANT, IDC_MINPQUANT, IDC_MAXPQUANT, - IDC_KFBOOST, IDC_DUMMY2PASS, - IDC_CURVECOMPH, IDC_CURVECOMPL, IDC_PAYBACK, IDC_PAYBACKBIAS, IDC_PAYBACKPROP, - IDC_STATS2, IDC_STATS2_BROWSE, + const short twopass1_disable[] = { + IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, + IDC_MINIQUANT, IDC_MAXIQUANT, IDC_MINPQUANT, IDC_MAXPQUANT, IDC_CREDITS_RATE_RADIO, IDC_CREDITS_RATE, IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE }; - const int twopass2_ext_disable[] = { + const short twopass2_ext_disable[] = { + IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, IDC_CREDITS_RATE_RADIO, IDC_CREDITS_QUANT_RADIO, IDC_CREDITS_QUANT_STATIC, IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_RATE, IDC_CREDITS_QUANTI, IDC_CREDITS_QUANTP, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE }; - const int twopass2_int_disable[] = { + const short twopass2_int_disable[] = { + IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, IDC_STATS2, IDC_STATS2_BROWSE }; // store pointers in order so we can lookup using config->mode - const int* modes[] = { + const short* modes[] = { cbr_disable, qual_disable, quant_disable, twopass1_disable, twopass2_ext_disable, twopass2_int_disable }; // ditto modes[] const int lengths[] = { - sizeof(cbr_disable)/sizeof(int), sizeof(qual_disable)/sizeof(int), - sizeof(quant_disable)/sizeof(int), sizeof(twopass1_disable)/sizeof(int), - sizeof(twopass2_ext_disable)/sizeof(int), sizeof(twopass2_int_disable)/sizeof(int) + sizeof(cbr_disable)/sizeof(short), sizeof(qual_disable)/sizeof(short), + sizeof(quant_disable)/sizeof(short), sizeof(twopass1_disable)/sizeof(short), + sizeof(twopass2_ext_disable)/sizeof(short), sizeof(twopass2_int_disable)/sizeof(short), 0 }; int i; + int hinted_me, use_alt, use_alt_auto, use_alt_auto_bonus; + int credits_start, credits_end, credits_rate, credits_quant, credits_size; + int cpu_force; // first perform checkbox-based enable/disable - CONTROLDLG(IDC_HINTFILE, ISDLGSET(IDC_HINTEDME)); - CONTROLDLG(IDC_HINT_BROWSE, ISDLGSET(IDC_HINTEDME)); - - CONTROLDLG(IDC_USEAUTO, ISDLGSET(IDC_USEALT)); - CONTROLDLG(IDC_AUTOSTR, ISDLGSET(IDC_USEALT) && ISDLGSET(IDC_USEAUTO)); - CONTROLDLG(IDC_USEAUTOBONUS, ISDLGSET(IDC_USEALT)); - CONTROLDLG(IDC_BONUSBIAS, (ISDLGSET(IDC_USEALT) && !(ISDLGSET(IDC_USEAUTOBONUS)))); - CONTROLDLG(IDC_CURVETYPE, ISDLGSET(IDC_USEALT)); - CONTROLDLG(IDC_ALTCURVEHIGH, ISDLGSET(IDC_USEALT)); - CONTROLDLG(IDC_ALTCURVELOW, ISDLGSET(IDC_USEALT)); - CONTROLDLG(IDC_MINQUAL, ISDLGSET(IDC_USEALT) && !(ISDLGSET(IDC_USEAUTO))); - - CONTROLDLG(IDC_CREDITS_START_BEGIN, ISDLGSET(IDC_CREDITS_START)); - CONTROLDLG(IDC_CREDITS_START_END, ISDLGSET(IDC_CREDITS_START)); - - CONTROLDLG(IDC_CREDITS_END_BEGIN, ISDLGSET(IDC_CREDITS_END)); - CONTROLDLG(IDC_CREDITS_END_END, ISDLGSET(IDC_CREDITS_END)); - - CONTROLDLG(IDC_CREDITS_RATE, ISDLGSET(IDC_CREDITS_RATE_RADIO)); - CONTROLDLG(IDC_CREDITS_QUANTI, ISDLGSET(IDC_CREDITS_QUANT_RADIO)); - CONTROLDLG(IDC_CREDITS_QUANTP, ISDLGSET(IDC_CREDITS_QUANT_RADIO)); - CONTROLDLG(IDC_CREDITS_START_SIZE, ISDLGSET(IDC_CREDITS_SIZE_RADIO)); - CONTROLDLG(IDC_CREDITS_END_SIZE, ISDLGSET(IDC_CREDITS_SIZE_RADIO)); - - CONTROLDLG(IDC_CPU_MMX, ISDLGSET(IDC_CPU_FORCE)); - CONTROLDLG(IDC_CPU_MMXEXT, ISDLGSET(IDC_CPU_FORCE)); - CONTROLDLG(IDC_CPU_SSE, ISDLGSET(IDC_CPU_FORCE)); - CONTROLDLG(IDC_CPU_SSE2, ISDLGSET(IDC_CPU_FORCE)); - CONTROLDLG(IDC_CPU_3DNOW, ISDLGSET(IDC_CPU_FORCE)); - CONTROLDLG(IDC_CPU_3DNOWEXT, ISDLGSET(IDC_CPU_FORCE)); + hinted_me = ISDLGSET(IDC_HINTEDME); + CONTROLDLG(IDC_HINTFILE, hinted_me); + CONTROLDLG(IDC_HINT_BROWSE, hinted_me); + + use_alt = ISDLGSET(IDC_USEALT) && (mode == DLG_MODE_2PASS_2_EXT || mode == DLG_MODE_2PASS_2_INT); + use_alt_auto = ISDLGSET(IDC_USEAUTO); + use_alt_auto_bonus = ISDLGSET(IDC_USEAUTOBONUS); + CONTROLDLG(IDC_USEAUTO, use_alt); + CONTROLDLG(IDC_AUTOSTR, use_alt && use_alt_auto); + CONTROLDLG(IDC_USEAUTOBONUS, use_alt); + CONTROLDLG(IDC_BONUSBIAS, use_alt && !use_alt_auto_bonus); + CONTROLDLG(IDC_CURVETYPE, use_alt); + CONTROLDLG(IDC_ALTCURVEHIGH, use_alt); + CONTROLDLG(IDC_ALTCURVELOW, use_alt); + CONTROLDLG(IDC_MINQUAL, use_alt && !use_alt_auto); + + credits_start = ISDLGSET(IDC_CREDITS_START); + CONTROLDLG(IDC_CREDITS_START_BEGIN, credits_start); + CONTROLDLG(IDC_CREDITS_START_END, credits_start); + + credits_end = ISDLGSET(IDC_CREDITS_END); + CONTROLDLG(IDC_CREDITS_END_BEGIN, credits_end); + CONTROLDLG(IDC_CREDITS_END_END, credits_end); + + credits_rate = ISDLGSET(IDC_CREDITS_RATE_RADIO); + credits_quant = ISDLGSET(IDC_CREDITS_QUANT_RADIO); + credits_size = ISDLGSET(IDC_CREDITS_SIZE_RADIO); + CONTROLDLG(IDC_CREDITS_RATE, credits_rate); + CONTROLDLG(IDC_CREDITS_QUANTI, credits_quant); + CONTROLDLG(IDC_CREDITS_QUANTP, credits_quant); + CONTROLDLG(IDC_CREDITS_START_SIZE, credits_size); + CONTROLDLG(IDC_CREDITS_END_SIZE, credits_size); + + cpu_force = ISDLGSET(IDC_CPU_FORCE); + CONTROLDLG(IDC_CPU_MMX, cpu_force); + CONTROLDLG(IDC_CPU_MMXEXT, cpu_force); + CONTROLDLG(IDC_CPU_SSE, cpu_force); + CONTROLDLG(IDC_CPU_SSE2, cpu_force); + CONTROLDLG(IDC_CPU_3DNOW, cpu_force); + CONTROLDLG(IDC_CPU_3DNOWEXT, cpu_force); // now perform codec mode enable/disable for (i=0 ; iquant_type, 0); SendDlgItemMessage(hDlg, IDC_FOURCC, CB_SETCURSEL, config->fourcc_used, 0); SetDlgItemInt(hDlg, IDC_MAXKEY, config->max_key_interval, FALSE); + SetDlgItemInt(hDlg, IDC_MINKEY, config->min_key_interval, FALSE); CheckDlgButton(hDlg, IDC_LUMMASK, config->lum_masking ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hDlg, IDC_INTERLACING, config->interlacing ? BST_CHECKED : BST_UNCHECKED); break; @@ -576,7 +607,6 @@ case DLG_2PASS : SetDlgItemInt(hDlg, IDC_KFBOOST, config->keyframe_boost, FALSE); - SetDlgItemInt(hDlg, IDC_MINKEY, config->min_key_interval, FALSE); CheckDlgButton(hDlg, IDC_DISCARD1PASS, config->discard1pass ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hDlg, IDC_DUMMY2PASS, config->dummy2pass ? BST_CHECKED : BST_UNCHECKED); @@ -605,6 +635,10 @@ CheckDlgButton(hDlg, IDC_USEAUTOBONUS, config->alt_curve_use_auto_bonus_bias ? BST_CHECKED : BST_UNCHECKED); SetDlgItemInt(hDlg, IDC_BONUSBIAS, config->alt_curve_bonus_bias, FALSE); + + SetDlgItemInt(hDlg, IDC_MAXBITRATE, config->twopass_max_bitrate / CONFIG_KBPS, FALSE); + SetDlgItemInt(hDlg, IDC_OVERIMP, config->twopass_max_overflow_improvement, FALSE); + SetDlgItemInt(hDlg, IDC_OVERDEG, config->twopass_max_overflow_degradation, FALSE); break; case DLG_CREDITS : @@ -645,6 +679,10 @@ CheckRadioButton(hDlg, IDC_CPU_AUTO, IDC_CPU_FORCE, config->cpu & XVID_CPU_FORCE ? IDC_CPU_FORCE : IDC_CPU_AUTO ); + + 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); break; } } @@ -665,6 +703,7 @@ config->quant_type = SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_GETCURSEL, 0, 0); config->fourcc_used = SendDlgItemMessage(hDlg, IDC_FOURCC, CB_GETCURSEL, 0, 0); config->max_key_interval = config_get_int(hDlg, IDC_MAXKEY, config->max_key_interval); + config->min_key_interval = config_get_int(hDlg, IDC_MINKEY, config->min_key_interval); config->lum_masking = ISDLGSET(IDC_LUMMASK); config->interlacing = ISDLGSET(IDC_INTERLACING); break; @@ -683,7 +722,6 @@ case DLG_2PASS : config->keyframe_boost = GetDlgItemInt(hDlg, IDC_KFBOOST, NULL, FALSE); - config->min_key_interval = config_get_int(hDlg, IDC_MINKEY, config->min_key_interval); config->discard1pass = ISDLGSET(IDC_DISCARD1PASS); config->dummy2pass = ISDLGSET(IDC_DUMMY2PASS); config->curve_compression_high = GetDlgItemInt(hDlg, IDC_CURVECOMPH, NULL, FALSE); @@ -724,6 +762,15 @@ config->alt_curve_high_dist = config_get_int(hDlg, IDC_ALTCURVEHIGH, config->alt_curve_high_dist); config->alt_curve_low_dist = config_get_int(hDlg, IDC_ALTCURVELOW, config->alt_curve_low_dist); config->alt_curve_min_rel_qual = config_get_int(hDlg, IDC_MINQUAL, config->alt_curve_min_rel_qual); + + config->twopass_max_bitrate /= CONFIG_KBPS; + config->twopass_max_bitrate = config_get_int(hDlg, IDC_MAXBITRATE, config->twopass_max_bitrate); + config->twopass_max_bitrate *= CONFIG_KBPS; + config->twopass_max_overflow_improvement = config_get_int(hDlg, IDC_OVERIMP, config->twopass_max_overflow_improvement); + config->twopass_max_overflow_degradation = config_get_int(hDlg, IDC_OVERDEG, config->twopass_max_overflow_degradation); + + CONSTRAINVAL(config->twopass_max_overflow_improvement, 1, 80); + CONSTRAINVAL(config->twopass_max_overflow_degradation, 1, 80); break; case DLG_CREDITS : @@ -770,6 +817,10 @@ config->cpu |= ISDLGSET(IDC_CPU_3DNOW) ? XVID_CPU_3DNOW: 0; config->cpu |= ISDLGSET(IDC_CPU_3DNOWEXT) ? XVID_CPU_3DNOWEXT: 0; config->cpu |= ISDLGSET(IDC_CPU_FORCE) ? XVID_CPU_FORCE : 0; + + config->rc_reaction_delay_factor = config_get_int(hDlg, IDC_CBR_REACTIONDELAY, config->rc_reaction_delay_factor); + config->rc_averaging_period = config_get_int(hDlg, IDC_CBR_AVERAGINGPERIOD, config->rc_averaging_period); + config->rc_buffer = config_get_int(hDlg, IDC_CBR_BUFFER, config->rc_buffer); break; } } @@ -797,11 +848,11 @@ temp = config_get_int(hDlg, i + IDC_QINTRA00, config->qmatrix_intra[i]); CONSTRAINVAL(temp, 1, 255); - temp = config->qmatrix_intra[i]; + config->qmatrix_intra[i] = temp; temp = config_get_int(hDlg, i + IDC_QINTER00, config->qmatrix_inter[i]); CONSTRAINVAL(temp, 1, 255); - temp = config->qmatrix_inter[i]; + config->qmatrix_inter[i] = temp; } } @@ -851,7 +902,6 @@ SendDlgItemMessage(hDlg, IDC_MODE, CB_ADDSTRING, 0, (LPARAM)"Null - test speed"); SendDlgItemMessage(hDlg, IDC_MODE, CB_SETCURSEL, config->mode, 0); - SetDlgItemInt(hDlg, IDC_CBRBUFFER, config->rc_buffersize, FALSE); InitCommonControls(); @@ -902,7 +952,6 @@ config_reg_default(config); SendDlgItemMessage(hDlg, IDC_MODE, CB_SETCURSEL, config->mode, 0); - SetDlgItemInt(hDlg, IDC_CBRBUFFER, config->rc_buffersize, FALSE); main_slider(hDlg, config); main_value(hDlg, config);