--- config.c 2002/08/06 23:40:45 1.18 +++ config.c 2002/11/19 13:23:17 1.20.2.2 @@ -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 "..\..\xvidcore\src\xvid.h" // cpu masks #include "resource.h" @@ -90,25 +91,29 @@ {"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 #ifdef BFRAMES {"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 @@ -117,16 +122,16 @@ // 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}, @@ -538,9 +543,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[] = { @@ -638,12 +643,17 @@ 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); + + 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 #ifdef BFRAMES 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); @@ -772,12 +782,17 @@ 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 #ifdef BFRAMES 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); @@ -1120,6 +1135,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");