--- trunk/vfw/src/config.c 2002/03/16 11:40:48 30 +++ trunk/vfw/src/config.c 2002/04/21 10:47:53 131 @@ -23,6 +23,22 @@ * * 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 + * added Foxer's new CBR engine + * - cbr_buffer is being used as reaction delay (quick hack) + * 23.03.2002 daniel smith + * added load defaults button + * merged foxer's alternative 2-pass code (2-pass alt tab) + * added proper tooltips + * moved registry data into reg_ints/reg_strs arrays + * added DEBUGERR output on errors instead of returning * 16.03.2002 daniel smith * rewrote/restructured most of file * added tooltips (kind of - dirty message hook method) @@ -49,10 +65,78 @@ #include "resource.h" +/* registry info structs */ + +CONFIG reg; + +REG_INT const reg_ints[] = { + {"mode", ®.mode, DLG_MODE_CBR}, + {"quality", ®.quality, 85}, + {"quant", ®.quant, 5}, + {"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}, + + {"min_iquant", ®.min_iquant, 1}, + {"max_iquant", ®.max_iquant, 31}, + {"min_pquant", ®.min_pquant, 1}, + {"max_pquant", ®.max_pquant, 31}, + + {"desired_size", ®.desired_size, 570000}, + {"keyframe_boost", ®.keyframe_boost, 20}, + {"discard1pass", ®.discard1pass, 1}, + {"dummy2pass", ®.dummy2pass, 0}, + {"curve_compression_high", ®.curve_compression_high, 25}, + {"curve_compression_low", ®.curve_compression_low, 10}, + {"use_alt_curve", ®.use_alt_curve, 0}, + {"alt_curve_use_auto", ®.alt_curve_use_auto, 1}, + {"alt_curve_auto_str", ®.alt_curve_auto_str, 50}, + {"alt_curve_use_auto_bonus_bias", ®.alt_curve_use_auto_bonus_bias, 1}, + {"alt_curve_bonus_bias", ®.alt_curve_bonus_bias, 50}, + {"alt_curve_type", ®.alt_curve_type, 1}, + {"alt_curve_high_dist", ®.alt_curve_high_dist, 300}, + {"alt_curve_low_dist", ®.alt_curve_low_dist, 300}, + {"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}, + {"credits_start_begin", ®.credits_start_begin, 0}, + {"credits_start_end", ®.credits_start_end, 0}, + {"credits_end", ®.credits_end, 0}, + {"credits_end_begin", ®.credits_end_begin, 0}, + {"credits_end_end", ®.credits_end_end, 0}, + + {"credits_mode", ®.credits_mode, 0}, + {"credits_rate", ®.credits_rate, 20}, + {"credits_quant_i", ®.credits_quant_i, 20}, + {"credits_quant_p", ®.credits_quant_p, 20}, + {"credits_start_size", ®.credits_start_size, 10000}, + {"credits_end_size", ®.credits_end_size, 10000} +}; + +REG_STR const reg_strs[] = { + {"hintfile", reg.hintfile, CONFIG_HINTFILE}, + {"stats1", reg.stats1, CONFIG_2PASS_1_FILE}, + {"stats2", reg.stats2, CONFIG_2PASS_2_FILE} +// {"build", reg.build, XVID_BUILD} +}; + /* get config settings from registry */ -#define REG_GET_N(X, Y, Z) size=sizeof(int);if(RegQueryValueEx(hKey, X, 0, 0, (LPBYTE)&Y, &size) != ERROR_SUCCESS) {Y=Z;} -#define REG_GET_S(X, Y, Z) size=MAX_PATH;if(RegQueryValueEx(hKey, X, 0, 0, Y, &size) != ERROR_SUCCESS) {lstrcpy(Y, Z);} #define REG_GET_B(X, Y, Z) size=sizeof((Z));if(RegQueryValueEx(hKey, X, 0, 0, Y, &size) != ERROR_SUCCESS) {memcpy(Y, Z, sizeof((Z)));} void config_reg_get(CONFIG * config) @@ -60,6 +144,7 @@ HKEY hKey; DWORD size; XVID_INIT_PARAM init_param; + int i; init_param.cpu_flags = 0; xvid_init(0, 0, &init_param, NULL); @@ -67,48 +152,25 @@ RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey); - REG_GET_N("mode", config->mode, DLG_MODE_CBR); - REG_GET_N("bitrate", config->bitrate, 900000); - REG_GET_N("quality", config->quality, 85); - REG_GET_N("quant", config->quant, 5); - REG_GET_N("rc_buffersize", config->rc_buffersize, 2048000); - - REG_GET_N("motion_search", config->motion_search, 5); - REG_GET_N("quant_type", config->quant_type, 0); - REG_GET_N("fourcc_used", config->fourcc_used, 0); - REG_GET_N("max_key_interval", config->max_key_interval, 300); - REG_GET_N("lum_masking", config->lum_masking, 0); - - REG_GET_N("min_iquant", config->min_iquant, 1); - REG_GET_N("max_iquant", config->max_iquant, 31); - REG_GET_N("min_pquant", config->min_pquant, 1); - REG_GET_N("max_pquant", config->max_pquant, 31); - - REG_GET_N("desired_size", config->desired_size, 570000); - REG_GET_N("keyframe_boost", config->keyframe_boost, 20); - REG_GET_N("min_key_interval", config->min_key_interval, 6); - REG_GET_N("discard1pass", config->discard1pass, 1); - REG_GET_N("dummy2pass", config->dummy2pass, 0); - REG_GET_N("curve_compression_high", config->curve_compression_high, 25); - REG_GET_N("curve_compression_low", config->curve_compression_low, 10); - REG_GET_N("bitrate_payback_delay", config->bitrate_payback_delay, 240); - REG_GET_N("bitrate_payback_method", config->bitrate_payback_method, 0); - REG_GET_S("stats1", config->stats1, CONFIG_2PASS_1_FILE); - REG_GET_S("stats2", config->stats2, CONFIG_2PASS_2_FILE); - - REG_GET_N("credits_start", config->credits_start, 0); - REG_GET_N("credits_start_begin", config->credits_start_begin, 0); - REG_GET_N("credits_start_end", config->credits_start_end, 0); - REG_GET_N("credits_end", config->credits_end, 0); - REG_GET_N("credits_end_begin", config->credits_end_begin, 0); - REG_GET_N("credits_end_end", config->credits_end_end, 0); - - REG_GET_N("credits_mode", config->credits_mode, 0); - REG_GET_N("credits_rate", config->credits_rate, 20); - REG_GET_N("credits_quant_i", config->credits_quant_i, 20); - REG_GET_N("credits_quant_p", config->credits_quant_p, 20); - REG_GET_N("credits_start_size", config->credits_start_size, 10000); - REG_GET_N("credits_end_size", config->credits_end_size, 10000); + for (i=0 ; iqmatrix_intra, default_qmatrix_intra); - REG_GET_B("qmatrix_inter", config->qmatrix_inter, default_qmatrix_inter); + REG_GET_B("qmatrix_intra", reg.qmatrix_intra, default_qmatrix_intra); + REG_GET_B("qmatrix_inter", reg.qmatrix_inter, default_qmatrix_inter); } + memcpy(config, ®, sizeof(CONFIG)); + RegCloseKey(hKey); } /* put config settings in registry */ -#define REG_SET_N(X, Y) RegSetValueEx(hKey, X, 0, REG_DWORD, (LPBYTE)&Y, sizeof(int)) -#define REG_SET_S(X, Y) RegSetValueEx(hKey, X, 0, REG_SZ, Y, lstrlen(Y)+1) #define REG_SET_B(X, Y) RegSetValueEx(hKey, X, 0, REG_BINARY, Y, sizeof((Y))) void config_reg_set(CONFIG * config) { HKEY hKey; DWORD dispo; + int i; if (RegCreateKeyEx( XVID_REG_KEY, @@ -167,50 +230,20 @@ return; } - REG_SET_N("mode", config->mode); - REG_SET_N("bitrate", config->bitrate); - REG_SET_N("quality", config->quality); - REG_SET_N("quant", config->quant); - REG_SET_N("rc_buffersize", config->rc_buffersize); - - REG_SET_N("motion_search", config->motion_search); - REG_SET_N("quant_type", config->quant_type); - REG_SET_N("fourcc_used", config->fourcc_used); - REG_SET_N("max_key_interval", config->max_key_interval); - REG_SET_N("lum_masking", config->lum_masking); - - REG_SET_N("min_iquant", config->min_iquant); - REG_SET_N("max_iquant", config->max_iquant); - REG_SET_N("min_pquant", config->min_pquant); - REG_SET_N("max_pquant", config->max_pquant); - REG_SET_B("qmatrix_intra", config->qmatrix_intra); - REG_SET_B("qmatrix_inter", config->qmatrix_inter); - - REG_SET_N("desired_size", config->desired_size); - REG_SET_N("keyframe_boost", config->keyframe_boost); - REG_SET_N("min_key_interval", config->min_key_interval); - REG_SET_N("discard1pass", config->discard1pass); - REG_SET_N("dummy2pass", config->dummy2pass); - REG_SET_N("curve_compression_high", config->curve_compression_high); - REG_SET_N("curve_compression_low", config->curve_compression_low); - REG_SET_N("bitrate_payback_delay", config->bitrate_payback_delay); - REG_SET_N("bitrate_payback_method", config->bitrate_payback_method); - REG_SET_S("stats1", config->stats1); - REG_SET_S("stats2", config->stats2); - - REG_SET_N("credits_start", config->credits_start); - REG_SET_N("credits_start_begin", config->credits_start_begin); - REG_SET_N("credits_start_end", config->credits_start_end); - REG_SET_N("credits_end", config->credits_end); - REG_SET_N("credits_end_begin", config->credits_end_begin); - REG_SET_N("credits_end_end", config->credits_end_end); - - REG_SET_N("credits_mode", config->credits_mode); - REG_SET_N("credits_rate", config->credits_rate); - REG_SET_N("credits_quant_i", config->credits_quant_i); - REG_SET_N("credits_quant_p", config->credits_quant_p); - REG_SET_N("credits_start_size", config->credits_start_size); - REG_SET_N("credits_end_size", config->credits_end_size); + memcpy(®, config, sizeof(CONFIG)); + + for (i=0 ; ibitrate = 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 : @@ -275,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); } @@ -294,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 : @@ -318,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)); } @@ -340,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 : @@ -394,6 +426,7 @@ psp[DLG_GLOBAL].pszTemplate = MAKEINTRESOURCE(IDD_GLOBAL); psp[DLG_QUANT].pszTemplate = MAKEINTRESOURCE(IDD_QUANT); psp[DLG_2PASS].pszTemplate = MAKEINTRESOURCE(IDD_2PASS); + psp[DLG_2PASSALT].pszTemplate = MAKEINTRESOURCE(IDD_2PASSALT); psp[DLG_CREDITS].pszTemplate = MAKEINTRESOURCE(IDD_CREDITS); psp[DLG_CPU].pszTemplate = MAKEINTRESOURCE(IDD_CPU); @@ -421,13 +454,19 @@ #define CONTROLDLG(X,Y) EnableWindow(GetDlgItem(hDlg, (X)), (Y)) #define ISDLGSET(X) (IsDlgButtonChecked(hDlg, (X)) == BST_CHECKED) +#define MOD_CBR + 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, @@ -435,80 +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_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; case DLG_QUANT : @@ -535,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); @@ -545,10 +616,31 @@ CheckDlgButton(hDlg, IDC_PAYBACKBIAS, (config->bitrate_payback_method == 0)); CheckDlgButton(hDlg, IDC_PAYBACKPROP, (config->bitrate_payback_method == 1)); + CheckDlgButton(hDlg, IDC_HINTEDME, config->hinted_me ? BST_CHECKED : BST_UNCHECKED); + SetDlgItemText(hDlg, IDC_HINTFILE, config->hintfile); SetDlgItemText(hDlg, IDC_STATS1, config->stats1); SetDlgItemText(hDlg, IDC_STATS2, config->stats2); break; + case DLG_2PASSALT : + CheckDlgButton(hDlg, IDC_USEALT, config->use_alt_curve ? BST_CHECKED : BST_UNCHECKED); + + SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_SETCURSEL, config->alt_curve_type, 0); + SetDlgItemInt(hDlg, IDC_ALTCURVEHIGH, config->alt_curve_high_dist, FALSE); + SetDlgItemInt(hDlg, IDC_ALTCURVELOW, config->alt_curve_low_dist, FALSE); + SetDlgItemInt(hDlg, IDC_MINQUAL, config->alt_curve_min_rel_qual, FALSE); + + CheckDlgButton(hDlg, IDC_USEAUTO, config->alt_curve_use_auto ? BST_CHECKED : BST_UNCHECKED); + SetDlgItemInt(hDlg, IDC_AUTOSTR, config->alt_curve_auto_str, FALSE); + + 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 : CheckDlgButton(hDlg, IDC_CREDITS_START, config->credits_start ? BST_CHECKED : BST_UNCHECKED); SetDlgItemInt(hDlg, IDC_CREDITS_START_BEGIN, config->credits_start_begin, FALSE); @@ -587,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; } } @@ -607,7 +703,9 @@ 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; case DLG_QUANT : @@ -624,14 +722,18 @@ 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); config->curve_compression_low = GetDlgItemInt(hDlg, IDC_CURVECOMPL, NULL, FALSE); config->bitrate_payback_delay = config_get_int(hDlg, IDC_PAYBACK, config->bitrate_payback_delay); config->bitrate_payback_method = ISDLGSET(IDC_PAYBACKPROP); + config->hinted_me = ISDLGSET(IDC_HINTEDME); + if (GetDlgItemText(hDlg, IDC_HINTFILE, config->hintfile, MAX_PATH) == 0) + { + lstrcpy(config->hintfile, CONFIG_HINTFILE); + } if (GetDlgItemText(hDlg, IDC_STATS1, config->stats1, MAX_PATH) == 0) { lstrcpy(config->stats1, CONFIG_2PASS_1_FILE); @@ -647,6 +749,30 @@ CONSTRAINVAL(config->curve_compression_low, 0, 100); break; + case DLG_2PASSALT : + config->use_alt_curve = ISDLGSET(IDC_USEALT); + + config->alt_curve_use_auto = ISDLGSET(IDC_USEAUTO); + config->alt_curve_auto_str = config_get_int(hDlg, IDC_AUTOSTR, config->alt_curve_auto_str); + + config->alt_curve_use_auto_bonus_bias = ISDLGSET(IDC_USEAUTOBONUS); + config->alt_curve_bonus_bias = config_get_int(hDlg, IDC_BONUSBIAS, config->alt_curve_bonus_bias); + + config->alt_curve_type = SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_GETCURSEL, 0, 0); + 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 : config->credits_start = ISDLGSET(IDC_CREDITS_START); config->credits_start_begin = GetDlgItemInt(hDlg, IDC_CREDITS_START_BEGIN, NULL, FALSE); @@ -691,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; } } @@ -718,72 +848,35 @@ 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; } } -/* monitor mouse events to dialog controls for help text */ -HHOOK hHook; -HWND hParent; +/* enumerates child windows, assigns tooltips */ -LRESULT CALLBACK msg_proc(int nCode, WPARAM wParam, LPARAM lParam) +BOOL CALLBACK enum_tooltips(HWND hWnd, LPARAM lParam) { - MSG* pmsg = (MSG *)lParam; + char help[500]; - if (pmsg->message == WM_MOUSEMOVE) + if (LoadString(hInst, GetDlgCtrlID(hWnd), help, 500)) { - if (pmsg->hwnd == hParent) - { - SetDlgItemText(hParent, IDC_STATIC_HELP, XVID_HELP); - } - else if (IsChild(hParent, pmsg->hwnd)) - { - char *message; - char help[500]; + TOOLINFO ti; - int mode = SendDlgItemMessage(hParent, IDC_MODE, CB_GETCURSEL, 0, 0); - int item = GetDlgCtrlID(pmsg->hwnd); + ti.cbSize = sizeof(TOOLINFO); + ti.uFlags = TTF_SUBCLASS | TTF_IDISHWND; + ti.hwnd = GetParent(hWnd); + ti.uId = (LPARAM)hWnd; + ti.lpszText = help; - if (item == IDC_VALUE || item == IDC_SLIDER) - { - switch (mode) - { - case DLG_MODE_2PASS_2_INT : - if (item == IDC_VALUE) - { - message = "Set the desired video size in Kilobytes"; - break; - } - default : - case DLG_MODE_CBR : - message = "Set the target video bitrate"; - break; - - case DLG_MODE_VBR_QUAL : - message = "Set the target video quality"; - break; - - case DLG_MODE_VBR_QUANT : - message = "Set the fixed quantizer for encoding"; - break; - } - lstrcpy(help, message); - } - else if (!LoadString(hInst, GetDlgCtrlID(pmsg->hwnd), help, 500)) - { - lstrcpy(help, XVID_HELP); - } - - SetDlgItemText(hParent, IDC_STATIC_HELP, help); - } + SendMessage(hTooltip, TTM_ADDTOOL, 0, (LPARAM)&ti); } - return (CallNextHookEx(hHook, nCode, wParam, lParam)); + return TRUE; } @@ -809,24 +902,22 @@ 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); - SetDlgItemText(hDlg, IDC_STATIC_HELP, XVID_HELP); - - hHook = SetWindowsHookEx(WH_GETMESSAGE, msg_proc, 0, GetCurrentThreadId()); - main_slider(hDlg, config); - main_value(hDlg, config); - break; + InitCommonControls(); - case WM_ACTIVATE : - if (LOWORD(wParam) != WA_INACTIVE) + if (hTooltip = CreateWindow(TOOLTIPS_CLASS, NULL, TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, hInst, NULL)) { - hParent = hDlg; + SetWindowPos(hTooltip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); + SendMessage(hTooltip, TTM_SETDELAYTIME, TTDT_AUTOMATIC, MAKELONG(1500, 0)); + SendMessage(hTooltip, TTM_SETMAXTIPWIDTH, 0, 400); + + EnumChildWindows(hDlg, enum_tooltips, 0); } - return 0; - case WM_DESTROY : - UnhookWindowsHookEx(hHook); + main_slider(hDlg, config); + main_value(hDlg, config); break; case WM_HSCROLL : @@ -856,6 +947,15 @@ config_reg_set(config); } } + else if (LOWORD(wParam) == IDC_DEFAULTS && HIWORD(wParam) == BN_CLICKED) + { + config_reg_default(config); + + SendDlgItemMessage(hDlg, IDC_MODE, CB_SETCURSEL, config->mode, 0); + + main_slider(hDlg, config); + main_value(hDlg, config); + } else if (HIWORD(wParam) == EN_UPDATE && LOWORD(wParam) == IDC_VALUE) { int value = config_get_int(hDlg, IDC_VALUE, 1); @@ -935,8 +1035,18 @@ SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"DIVX"); SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"DX50"); } + else if (psi->page == DLG_2PASSALT) + { + SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"Low"); + SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"Medium"); + SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"High"); + } + + if (hTooltip) + { + EnumChildWindows(hDlg, enum_tooltips, 0); + } - SetDlgItemText(hDlg, IDC_STATIC_HELP, XVID_HELP); adv_upload(hDlg, psi->page, psi->config); adv_mode(hDlg, psi->config->mode); break; @@ -946,6 +1056,10 @@ { switch (LOWORD(wParam)) { + case IDC_HINTEDME : + case IDC_USEALT : + case IDC_USEAUTO : + case IDC_USEAUTOBONUS : case IDC_CREDITS_START : case IDC_CREDITS_END : case IDC_CREDITS_RATE_RADIO : @@ -957,7 +1071,7 @@ break; } } - if ((LOWORD(wParam) == IDC_STATS1_BROWSE || LOWORD(wParam) == IDC_STATS2_BROWSE) && HIWORD(wParam) == BN_CLICKED) + if ((LOWORD(wParam) == IDC_HINT_BROWSE || LOWORD(wParam) == IDC_STATS1_BROWSE || LOWORD(wParam) == IDC_STATS2_BROWSE) && HIWORD(wParam) == BN_CLICKED) { OPENFILENAME ofn; char tmp[MAX_PATH]; @@ -974,8 +1088,15 @@ ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_PATHMUSTEXIST; - // display save box for stats1 using 1st-pass - if (LOWORD(wParam) == IDC_STATS1_BROWSE && + if (LOWORD(wParam) == IDC_HINT_BROWSE) + { + ofn.lpstrFilter = "motion hints (*.mvh)\0*.mvh\0All files (*.*)\0*.*\0\0"; + if (GetOpenFileName(&ofn)) + { + SetDlgItemText(hDlg, IDC_HINTFILE, tmp); + } + } + else if (LOWORD(wParam) == IDC_STATS1_BROWSE && psi->config->mode == DLG_MODE_2PASS_1) { ofn.Flags |= OFN_OVERWRITEPROMPT; @@ -1001,10 +1122,6 @@ case WM_NOTIFY : switch (((NMHDR *)lParam)->code) { - case PSN_SETACTIVE : - hParent = hDlg; - break; - case PSN_KILLACTIVE : /* validate */ adv_download(hDlg, psi->page, psi->config); @@ -1040,14 +1157,12 @@ SetWindowLong(hDlg, GWL_USERDATA, lParam); config = (CONFIG*)lParam; quant_upload(hDlg, config); - break; - case WM_ACTIVATE : - if (LOWORD(wParam) != WA_INACTIVE) + if (hTooltip) { - hParent = hDlg; + EnumChildWindows(hDlg, enum_tooltips, 0); } - return 0; + break; case WM_COMMAND : if (LOWORD(wParam) == IDOK && HIWORD(wParam) == BN_CLICKED) @@ -1091,13 +1206,13 @@ if (hFile == INVALID_HANDLE_VALUE) { - DEBUG("Couldn't save quant matrix"); + DEBUGERR("Couldn't save quant matrix"); } else { if (!WriteFile(hFile, quant_data, 128, &wrote, 0)) { - DEBUG("Couldnt write quant matrix"); + DEBUGERR("Couldnt write quant matrix"); } } @@ -1113,13 +1228,13 @@ if (hFile == INVALID_HANDLE_VALUE) { - DEBUG("Couldn't load quant matrix"); + DEBUGERR("Couldn't load quant matrix"); } else { if (!ReadFile(hFile, quant_data, 128, &read, 0)) { - DEBUG("Couldnt read quant matrix"); + DEBUGERR("Couldnt read quant matrix"); } else { @@ -1156,7 +1271,7 @@ HFONT hFont; LOGFONT lfData; - SetDlgItemText(hDlg, IDC_BUILD, __TIME__ ", " __DATE__); + SetDlgItemText(hDlg, IDC_BUILD, XVID_BUILD); xvid_init(NULL, 0, &init_param, 0); wsprintf(core, "Core Version %d.%d", (init_param.api_version>>16),(init_param.api_version&0xFFFFU));