--- config.c 2002/11/21 12:51:28 1.20.2.3 +++ config.c 2003/02/15 06:32:08 1.20.2.8 @@ -84,9 +84,10 @@ {"rc_averaging_period", ®.rc_averaging_period, 100}, {"rc_buffer", ®.rc_buffer, 100}, - {"motion_search", ®.motion_search, 5}, + {"motion_search", ®.motion_search, 6}, {"quant_type", ®.quant_type, 0}, {"fourcc_used", ®.fourcc_used, 0}, + {"vhq_mode", ®.vhq_mode, 0}, {"max_key_interval", ®.max_key_interval, 300}, {"min_key_interval", ®.min_key_interval, 1}, {"lum_masking", ®.lum_masking, 0}, @@ -101,8 +102,10 @@ {"bquant_ratio", ®.bquant_ratio, 150}, {"bquant_offset", ®.bquant_offset, 100}, {"packed", ®.packed, 0}, - {"dx50bvop", ®.dx50bvop, 0}, + {"dx50bvop", ®.dx50bvop, 1}, {"debug", ®.debug, 0}, + {"reduced_resolution", ®.reduced_resolution, 0}, + {"chroma_opt", ®.chroma_opt, 0}, {"frame_drop_ratio", ®.frame_drop_ratio, 0}, {"min_iquant", ®.min_iquant, 2}, @@ -116,11 +119,11 @@ {"dummy2pass", ®.dummy2pass, 0}, // added by koepi for new two-pass curve treatment {"kftreshold", ®.kftreshold, 10}, - {"kfreduction", ®.kfreduction, 30}, + {"kfreduction", ®.kfreduction, 20}, // 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, 1}, + {"curve_compression_high", ®.curve_compression_high, 0}, + {"curve_compression_low", ®.curve_compression_low, 0}, + {"use_alt_curve", ®.use_alt_curve, 0}, {"alt_curve_use_auto", ®.alt_curve_use_auto, 1}, {"alt_curve_auto_str", ®.alt_curve_auto_str, 30}, {"alt_curve_use_auto_bonus_bias", ®.alt_curve_use_auto_bonus_bias, 1}, @@ -151,7 +154,11 @@ {"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} + {"credits_end_size", ®.credits_end_size, 10000}, + + /* decoder */ + {"deblock_y", ®.deblock_y, 0}, + {"deblock_uv", ®.deblock_uv, 0} }; REG_STR const reg_strs[] = { @@ -637,6 +644,7 @@ SendDlgItemMessage(hDlg, IDC_MOTION, CB_SETCURSEL, config->motion_search, 0); SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_SETCURSEL, config->quant_type, 0); SendDlgItemMessage(hDlg, IDC_FOURCC, CB_SETCURSEL, config->fourcc_used, 0); + SendDlgItemMessage(hDlg, IDC_VHQ, CB_SETCURSEL, config->vhq_mode, 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); @@ -654,6 +662,8 @@ 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); + + CheckDlgButton(hDlg, IDC_REDUCED, config->reduced_resolution ? BST_CHECKED : BST_UNCHECKED); break; case DLG_QUANT : @@ -747,6 +757,7 @@ #ifdef _SMP SetDlgItemInt(hDlg, IDC_NUMTHREADS, config->num_threads, FALSE); #endif + CheckDlgButton(hDlg, IDC_CHROMA_OPT, (config->chroma_opt) ? BST_CHECKED : BST_UNCHECKED); 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); @@ -770,6 +781,7 @@ 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->vhq_mode = SendDlgItemMessage(hDlg, IDC_VHQ, CB_GETCURSEL, 0, 0); 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); @@ -787,6 +799,7 @@ config->packed = ISDLGSET(IDC_PACKED); config->dx50bvop = ISDLGSET(IDC_DX50BVOP); config->debug = ISDLGSET(IDC_DEBUG); + config->reduced_resolution = ISDLGSET(IDC_REDUCED); break; case DLG_QUANT : @@ -909,6 +922,7 @@ #ifdef _SMP config->num_threads = config_get_uint(hDlg, IDC_NUMTHREADS, config->num_threads); #endif + config->chroma_opt = ISDLGSET(IDC_CHROMA_OPT); 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); @@ -972,6 +986,134 @@ } + +/* --- decoder options dialog --- */ + +#define DEC_DLG_COUNT 1 +#define DEC_DLG_POSTPROC 0 + +/* decoder dialog: upload config data */ + +void dec_upload(HWND hDlg, int page, CONFIG * config) +{ + switch (page) + { + case DEC_DLG_POSTPROC : + CheckDlgButton(hDlg, IDC_DEBLOCK_Y, config->deblock_y ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hDlg, IDC_DEBLOCK_UV, config->deblock_uv ? BST_CHECKED : BST_UNCHECKED); + break; + } +} + + +/* dec dialog: download config data */ + +void dec_download(HWND hDlg, int page, CONFIG * config) +{ + switch (page) + { + case DEC_DLG_POSTPROC : + config->deblock_y = ISDLGSET(IDC_DEBLOCK_Y); + config->deblock_uv = ISDLGSET(IDC_DEBLOCK_UV); + break; + } +} + +/* decoder dialog proc */ + +BOOL CALLBACK dec_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + PROPSHEETINFO *psi; + + psi = (PROPSHEETINFO*)GetWindowLong(hDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG : + psi = (PROPSHEETINFO*) ((LPPROPSHEETPAGE)lParam)->lParam; + + SetWindowLong(hDlg, GWL_USERDATA, (LPARAM)psi); + + if (hTooltip) + { + EnumChildWindows(hDlg, enum_tooltips, 0); + } + + dec_upload(hDlg, psi->page, psi->config); + break; + + case WM_NOTIFY : + switch (((NMHDR *)lParam)->code) + { + case PSN_KILLACTIVE : + /* validate */ + dec_download(hDlg, psi->page, psi->config); + SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); + break; + + case PSN_APPLY : + /* apply */ + dec_download(hDlg, psi->page, psi->config); + SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); + psi->config->save = TRUE; + break; + } + break; + + default : + return 0; + } + + return 1; +} + + +void dec_dialog(HWND hParent, CONFIG * config) +{ + PROPSHEETINFO psi[DEC_DLG_COUNT]; + PROPSHEETPAGE psp[DEC_DLG_COUNT]; + PROPSHEETHEADER psh; + CONFIG temp; + int i; + + config->save = FALSE; + memcpy(&temp, config, sizeof(CONFIG)); + + for (i=0 ; isave) + { + config_reg_set(config); + } + } else if (LOWORD(wParam) == IDC_DEFAULTS && HIWORD(wParam) == BN_CLICKED) { config_reg_default(config); @@ -1128,14 +1279,13 @@ SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"DIVX"); SendDlgItemMessage(hDlg, IDC_FOURCC, CB_ADDSTRING, 0, (LPARAM)"DX50"); - 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); + SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"0 - Off"); + SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"1 - Mode Decision"); + SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"2 - Limited Search"); + SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"3 - Medium Search"); + SendDlgItemMessage(hDlg, IDC_VHQ, CB_ADDSTRING, 0, (LPARAM)"4 - Wide Search"); + /* XXX: reduced resolution is not ready for prime-time */ + ShowWindow(GetDlgItem(hDlg, IDC_REDUCED), SW_HIDE); } else if (psi->page == DLG_2PASSALT) { @@ -1146,12 +1296,9 @@ else if (psi->page == DLG_CPU) { #ifndef _SMP - EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS_STATIC), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS), FALSE); #endif - EnableWindow(GetDlgItem(hDlg, IDC_FRAMEDROP_STATIC), FALSE); - EnableWindow(GetDlgItem(hDlg, IDC_FRAMEDROP), FALSE); } if (hTooltip)