--- trunk/vfw/src/config.c 2002/07/21 03:49:47 324 +++ branches/dev-api-3/vfw/src/config.c 2002/11/21 12:51:28 670 @@ -50,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 * *************************************************************************/ @@ -63,9 +63,10 @@ #include #endif +#include // XviD API + #include "codec.h" #include "config.h" -#include "xvid.h" // cpu masks #include "resource.h" @@ -90,36 +91,45 @@ {"min_key_interval", ®.min_key_interval, 1}, {"lum_masking", ®.lum_masking, 0}, {"interlacing", ®.interlacing, 0}, -#ifdef BFRAMES + {"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, 200}, + {"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}, -#endif - {"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}, @@ -133,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}, @@ -488,6 +501,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, }; @@ -497,21 +513,23 @@ 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 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 + IDC_CREDITS_SIZE_RADIO, IDC_CREDITS_END_STATIC, IDC_CREDITS_START_SIZE, IDC_CREDITS_END_SIZE, + IDC_HINTFILE }; 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_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 short twopass1_disable[] = { @@ -523,9 +541,9 @@ 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 short twopass2_int_disable[] = { @@ -623,13 +641,19 @@ 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); -#ifdef BFRAMES + + 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); -#endif break; case DLG_QUANT : @@ -643,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); @@ -683,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); @@ -717,11 +747,7 @@ #ifdef _SMP 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); @@ -748,13 +774,19 @@ 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); -#ifdef BFRAMES + + 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); -#endif break; case DLG_QUANT : @@ -771,6 +803,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); @@ -830,6 +866,9 @@ 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); +// 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); @@ -870,10 +909,7 @@ #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); config->rc_buffer = config_get_uint(hDlg, IDC_CBR_BUFFER, config->rc_buffer); @@ -1086,12 +1122,12 @@ 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"); SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"DX50"); -#ifndef BFRAMES EnableWindow(GetDlgItem(hDlg, IDC_BSTATIC1), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_BSTATIC2), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_BSTATIC3), FALSE); @@ -1100,7 +1136,6 @@ EnableWindow(GetDlgItem(hDlg, IDC_PACKED), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_DX50BVOP), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_DEBUG), FALSE); -#endif } else if (psi->page == DLG_2PASSALT) { @@ -1115,10 +1150,8 @@ 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) @@ -1351,6 +1384,7 @@ 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);