--- config.c 2002/08/18 12:12:20 1.20 +++ config.c 2002/11/29 10:46:15 1.20.2.4 @@ -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 * *************************************************************************/ @@ -91,17 +91,19 @@ {"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, 2}, {"max_iquant", ®.max_iquant, 31}, @@ -539,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[] = { @@ -639,16 +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); + + 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); -#endif break; case DLG_QUANT : @@ -742,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); @@ -773,16 +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); + + 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); -#endif break; case DLG_QUANT : @@ -905,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); @@ -1121,21 +1122,11 @@ 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); - EnableWindow(GetDlgItem(hDlg, IDC_MAXBFRAMES), FALSE); - EnableWindow(GetDlgItem(hDlg, IDC_BQUANTRATIO), FALSE); - 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) { @@ -1146,14 +1137,9 @@ else if (psi->page == DLG_CPU) { #ifndef _SMP - 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)