--- trunk/vfw/src/config.c 2002/04/15 08:03:50 121 +++ branches/dev-api-3/vfw/src/config.c 2002/11/29 10:46:15 689 @@ -23,6 +23,9 @@ * * History: * + * 15.06.2002 added bframes options + * 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 @@ -47,7 +50,7 @@ * now get Core Version use xvid_init() * 05.03.2002 Min Chen * Add Core version display to about box - * 01.12.2001 inital version; (c)2001 peter ross + * 01.12.2001 inital version; (c)2001 peter ross * *************************************************************************/ @@ -56,13 +59,18 @@ #include #include #include +#ifdef _SMP +#include +#endif + +#include // XviD API #include "codec.h" #include "config.h" -#include "xvid.h" // cpu masks #include "resource.h" + /* registry info structs */ CONFIG reg; @@ -83,28 +91,45 @@ {"min_key_interval", ®.min_key_interval, 1}, {"lum_masking", ®.lum_masking, 0}, {"interlacing", ®.interlacing, 0}, + {"qpel", ®.qpel, 0}, + {"gmc", ®.gmc, 0}, + {"chromame", ®.chromame, 0}, +//added by koepi for gruel's greyscale_mode + {"greyscale", ®.greyscale, 0}, +// end of koepi's additions + {"max_bframes", ®.max_bframes, -1}, + {"bquant_ratio", ®.bquant_ratio, 150}, + {"bquant_offset", ®.bquant_offset, 100}, + {"packed", ®.packed, 0}, + {"dx50bvop", ®.dx50bvop, 0}, + {"debug", ®.debug, 0}, + {"frame_drop_ratio", ®.frame_drop_ratio, 0}, - {"min_iquant", ®.min_iquant, 1}, + {"min_iquant", ®.min_iquant, 2}, {"max_iquant", ®.max_iquant, 31}, - {"min_pquant", ®.min_pquant, 1}, + {"min_pquant", ®.min_pquant, 2}, {"max_pquant", ®.max_pquant, 31}, {"desired_size", ®.desired_size, 570000}, - {"keyframe_boost", ®.keyframe_boost, 20}, + {"keyframe_boost", ®.keyframe_boost, 0}, {"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}, + {"use_alt_curve", ®.use_alt_curve, 1}, {"alt_curve_use_auto", ®.alt_curve_use_auto, 1}, - {"alt_curve_auto_str", ®.alt_curve_auto_str, 50}, + {"alt_curve_auto_str", ®.alt_curve_auto_str, 30}, {"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_high_dist", ®.alt_curve_high_dist, 500}, + {"alt_curve_low_dist", ®.alt_curve_low_dist, 90}, {"alt_curve_min_rel_qual", ®.alt_curve_min_rel_qual, 50}, - {"bitrate_payback_delay", ®.bitrate_payback_delay, 240}, + {"bitrate_payback_delay", ®.bitrate_payback_delay, 250}, {"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}, @@ -118,6 +143,9 @@ {"credits_end_begin", ®.credits_end_begin, 0}, {"credits_end_end", ®.credits_end_end, 0}, +// added by koepi for greyscale credits + {"credits_greyscale", ®.credits_greyscale, 0}, +// end of koepi's addition {"credits_mode", ®.credits_mode, 0}, {"credits_rate", ®.credits_rate, 20}, {"credits_quant_i", ®.credits_quant_i, 20}, @@ -144,9 +172,13 @@ XVID_INIT_PARAM init_param; int i; - init_param.cpu_flags = 0; + init_param.cpu_flags = XVID_CPU_CHKONLY; xvid_init(0, 0, &init_param, NULL); - config->cpu = init_param.cpu_flags; + reg.cpu = init_param.cpu_flags; + +#ifdef _SMP + reg.num_threads = pthread_num_processors_np(); +#endif RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey); @@ -273,7 +305,17 @@ /* leaves current config value if dialog item is empty */ -int config_get_int(HWND hDlg, UINT item, int config) +int config_get_int(HWND hDlg, INT item, int config) +{ + BOOL success = FALSE; + + int tmp = GetDlgItemInt(hDlg, item, &success, TRUE); + + return (success) ? tmp : config; +} + + +int config_get_uint(HWND hDlg, UINT item, int config) { BOOL success = FALSE; @@ -291,19 +333,19 @@ { default : case DLG_MODE_CBR : - config->rc_bitrate = config_get_int(hDlg, IDC_VALUE, config->rc_bitrate) * CONFIG_KBPS; + config->rc_bitrate = config_get_uint(hDlg, IDC_VALUE, config->rc_bitrate) * CONFIG_KBPS; break; case DLG_MODE_VBR_QUAL : - config->quality = config_get_int(hDlg, IDC_VALUE, config->quality); + config->quality = config_get_uint(hDlg, IDC_VALUE, config->quality); break; case DLG_MODE_VBR_QUANT : - config->quant = config_get_int(hDlg, IDC_VALUE, config->quant); + config->quant = config_get_uint(hDlg, IDC_VALUE, config->quant); break; case DLG_MODE_2PASS_2_INT : - config->desired_size = config_get_int(hDlg, IDC_VALUE, config->desired_size); + config->desired_size = config_get_uint(hDlg, IDC_VALUE, config->desired_size); break; } @@ -457,108 +499,131 @@ void adv_mode(HWND hDlg, int mode) { // create arrays of controls to be disabled for each mode - const int cbr_disable[] = { - IDC_KFBOOST, IDC_DISCARD1PASS, IDC_DUMMY2PASS, + 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_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, - IDC_CREDITS_END_STATIC, IDC_CREDITS_RATE, IDC_CREDITS_QUANTI, IDC_CREDITS_QUANTP, - IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, + IDC_CREDITS_QUANTI, IDC_CREDITS_QUANTP, IDC_CREDITS_END_STATIC, IDC_CREDITS_RATE, + IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, IDC_CREDITS_GREYSCALE, IDC_HINTFILE }; - const int qual_disable[] = { + const short qual_disable[] = { + IDC_STATS1, IDC_STATS1_BROWSE, IDC_DISCARD1PASS, IDC_HINTEDME, IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, - IDC_KFBOOST, 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 + IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, + IDC_HINTFILE }; - 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_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 + IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, + IDC_HINTFILE }; - const int twopass1_disable[] = { + const short twopass1_disable[] = { IDC_CBR_REACTIONDELAY, IDC_CBR_AVERAGINGPERIOD, IDC_CBR_BUFFER, - 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, + 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_RATE_RADIO, 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 + 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 ; imin_key_interval, FALSE); CheckDlgButton(hDlg, IDC_LUMMASK, config->lum_masking ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hDlg, IDC_INTERLACING, config->interlacing ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hDlg, IDC_QPEL, config->qpel ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hDlg, IDC_GMC, config->gmc ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hDlg, IDC_CHROMAME, config->chromame ? BST_CHECKED : BST_UNCHECKED); +// added by koepi for gruel's greyscale_mode + CheckDlgButton(hDlg, IDC_GREYSCALE, config->greyscale ? BST_CHECKED : BST_UNCHECKED); +// end of koepi's addition + SetDlgItemInt(hDlg, IDC_MAXBFRAMES, config->max_bframes, TRUE); + SetDlgItemInt(hDlg, IDC_BQUANTRATIO, config->bquant_ratio, FALSE); + SetDlgItemInt(hDlg, IDC_BQUANTOFFSET, config->bquant_offset, FALSE); + CheckDlgButton(hDlg, IDC_PACKED, config->packed ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hDlg, IDC_DX50BVOP, config->dx50bvop ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hDlg, IDC_DEBUG, config->debug ? BST_CHECKED : BST_UNCHECKED); break; case DLG_QUANT : @@ -589,7 +667,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); @@ -629,6 +710,9 @@ SetDlgItemInt(hDlg, IDC_CREDITS_END_BEGIN, config->credits_end_begin, FALSE); SetDlgItemInt(hDlg, IDC_CREDITS_END_END, config->credits_end_end, FALSE); +// added by koepi for credits greyscale + CheckDlgButton(hDlg, IDC_CREDITS_GREYSCALE, config->credits_greyscale ? BST_CHECKED : BST_UNCHECKED); +// end of koepi's addition SetDlgItemInt(hDlg, IDC_CREDITS_RATE, config->credits_rate, FALSE); SetDlgItemInt(hDlg, IDC_CREDITS_QUANTI, config->credits_quant_i, FALSE); SetDlgItemInt(hDlg, IDC_CREDITS_QUANTP, config->credits_quant_p, FALSE); @@ -660,6 +744,10 @@ CheckRadioButton(hDlg, IDC_CPU_AUTO, IDC_CPU_FORCE, config->cpu & XVID_CPU_FORCE ? IDC_CPU_FORCE : IDC_CPU_AUTO ); +#ifdef _SMP + SetDlgItemInt(hDlg, IDC_NUMTHREADS, config->num_threads, FALSE); +#endif + SetDlgItemInt(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio, FALSE); 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); @@ -682,17 +770,30 @@ config->motion_search = SendDlgItemMessage(hDlg, IDC_MOTION, CB_GETCURSEL, 0, 0); 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->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); config->lum_masking = ISDLGSET(IDC_LUMMASK); config->interlacing = ISDLGSET(IDC_INTERLACING); + + config->qpel = ISDLGSET(IDC_QPEL); + config->gmc = ISDLGSET(IDC_GMC); + config->chromame = ISDLGSET(IDC_CHROMAME); +// added by koepi for gruel's greyscale_mode + config->greyscale = ISDLGSET(IDC_GREYSCALE); +// end of koepi's addition + config->max_bframes = config_get_int(hDlg, IDC_MAXBFRAMES, config->max_bframes); + config->bquant_ratio = config_get_uint(hDlg, IDC_BQUANTRATIO, config->bquant_ratio); + config->bquant_offset = config_get_uint(hDlg, IDC_BQUANTOFFSET, config->bquant_offset); + config->packed = ISDLGSET(IDC_PACKED); + config->dx50bvop = ISDLGSET(IDC_DX50BVOP); + config->debug = ISDLGSET(IDC_DEBUG); break; case DLG_QUANT : - config->min_iquant = config_get_int(hDlg, IDC_MINIQUANT, config->min_iquant); - config->max_iquant = config_get_int(hDlg, IDC_MAXIQUANT, config->max_iquant); - config->min_pquant = config_get_int(hDlg, IDC_MINPQUANT, config->min_pquant); - config->max_pquant = config_get_int(hDlg, IDC_MAXPQUANT, config->max_pquant); + config->min_iquant = config_get_uint(hDlg, IDC_MINIQUANT, config->min_iquant); + config->max_iquant = config_get_uint(hDlg, IDC_MAXIQUANT, config->max_iquant); + config->min_pquant = config_get_uint(hDlg, IDC_MINPQUANT, config->min_pquant); + config->max_pquant = config_get_uint(hDlg, IDC_MAXPQUANT, config->max_pquant); CONSTRAINVAL(config->min_iquant, 1, 31); CONSTRAINVAL(config->max_iquant, config->min_iquant, 31); @@ -702,11 +803,15 @@ 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); 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_delay = config_get_uint(hDlg, IDC_PAYBACK, config->bitrate_payback_delay); config->bitrate_payback_method = ISDLGSET(IDC_PAYBACKPROP); config->hinted_me = ISDLGSET(IDC_HINTEDME); @@ -733,21 +838,21 @@ 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_auto_str = config_get_uint(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_bonus_bias = config_get_uint(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->alt_curve_high_dist = config_get_uint(hDlg, IDC_ALTCURVEHIGH, config->alt_curve_high_dist); + config->alt_curve_low_dist = config_get_uint(hDlg, IDC_ALTCURVELOW, config->alt_curve_low_dist); + config->alt_curve_min_rel_qual = config_get_uint(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_get_uint(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); + 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); @@ -756,16 +861,19 @@ case DLG_CREDITS : config->credits_start = ISDLGSET(IDC_CREDITS_START); config->credits_start_begin = GetDlgItemInt(hDlg, IDC_CREDITS_START_BEGIN, NULL, FALSE); - config->credits_start_end = config_get_int(hDlg, IDC_CREDITS_START_END, config->credits_start_end); + config->credits_start_end = config_get_uint(hDlg, IDC_CREDITS_START_END, config->credits_start_end); config->credits_end = ISDLGSET(IDC_CREDITS_END); - config->credits_end_begin = config_get_int(hDlg, IDC_CREDITS_END_BEGIN, config->credits_end_begin); - config->credits_end_end = config_get_int(hDlg, IDC_CREDITS_END_END, config->credits_end_end); + config->credits_end_begin = config_get_uint(hDlg, IDC_CREDITS_END_BEGIN, config->credits_end_begin); + config->credits_end_end = config_get_uint(hDlg, IDC_CREDITS_END_END, config->credits_end_end); - config->credits_rate = config_get_int(hDlg, IDC_CREDITS_RATE, config->credits_rate); - config->credits_quant_i = config_get_int(hDlg, IDC_CREDITS_QUANTI, config->credits_quant_i); - config->credits_quant_p = config_get_int(hDlg, IDC_CREDITS_QUANTP, config->credits_quant_p); - config->credits_start_size = config_get_int(hDlg, IDC_CREDITS_START_SIZE, config->credits_start_size); - config->credits_end_size = config_get_int(hDlg, IDC_CREDITS_END_SIZE, config->credits_end_size); +// added by koepi for gruel's greyscale_mode + config->credits_greyscale = ISDLGSET(IDC_CREDITS_GREYSCALE); +// end of koepi's addition + config->credits_rate = config_get_uint(hDlg, IDC_CREDITS_RATE, config->credits_rate); + config->credits_quant_i = config_get_uint(hDlg, IDC_CREDITS_QUANTI, config->credits_quant_i); + config->credits_quant_p = config_get_uint(hDlg, IDC_CREDITS_QUANTP, config->credits_quant_p); + config->credits_start_size = config_get_uint(hDlg, IDC_CREDITS_START_SIZE, config->credits_start_size); + config->credits_end_size = config_get_uint(hDlg, IDC_CREDITS_END_SIZE, config->credits_end_size); config->credits_mode = 0; config->credits_mode = ISDLGSET(IDC_CREDITS_RATE_RADIO) ? CREDITS_MODE_RATE : config->credits_mode; @@ -798,9 +906,13 @@ 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); +#ifdef _SMP + config->num_threads = config_get_uint(hDlg, IDC_NUMTHREADS, config->num_threads); +#endif + config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio); + 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); + config->rc_buffer = config_get_uint(hDlg, IDC_CBR_BUFFER, config->rc_buffer); break; } } @@ -826,13 +938,13 @@ { int temp; - temp = config_get_int(hDlg, i + IDC_QINTRA00, config->qmatrix_intra[i]); + temp = config_get_uint(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]); + temp = config_get_uint(hDlg, i + IDC_QINTER00, config->qmatrix_inter[i]); CONSTRAINVAL(temp, 1, 255); - temp = config->qmatrix_inter[i]; + config->qmatrix_inter[i] = temp; } } @@ -938,7 +1050,7 @@ } else if (HIWORD(wParam) == EN_UPDATE && LOWORD(wParam) == IDC_VALUE) { - int value = config_get_int(hDlg, IDC_VALUE, 1); + int value = config_get_uint(hDlg, IDC_VALUE, 1); int max = 1; max = (config->mode == DLG_MODE_CBR) ? 10000 : @@ -1010,6 +1122,7 @@ SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"MPEG"); SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"MPEG-Custom"); SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"Modulated"); + SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_ADDSTRING, 0, (LPARAM)"New Modulated HQ"); SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"XVID"); SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"DIVX"); @@ -1021,6 +1134,13 @@ SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"Medium"); SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_ADDSTRING, 0, (LPARAM)"High"); } + else if (psi->page == DLG_CPU) + { +#ifndef _SMP + EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS_STATIC), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS), FALSE); +#endif + } if (hTooltip) { @@ -1252,7 +1372,9 @@ LOGFONT lfData; SetDlgItemText(hDlg, IDC_BUILD, XVID_BUILD); + SetDlgItemText(hDlg, IDC_SPECIAL_BUILD, XVID_SPECIAL_BUILD); + init_param.cpu_flags = XVID_CPU_CHKONLY; xvid_init(NULL, 0, &init_param, 0); wsprintf(core, "Core Version %d.%d", (init_param.api_version>>16),(init_param.api_version&0xFFFFU)); SetDlgItemText(hDlg, IDC_CORE, core);