--- branches/dev-api-4/xvidcore/vfw/src/config.c 2003/05/17 13:37:49 1032 +++ branches/dev-api-4/xvidcore/vfw/src/config.c 2004/01/22 16:13:59 1323 @@ -47,7 +47,7 @@ * advanced controls are now enabled/disabled by mode * added modulated quantization, DX50 fourcc * 11.03.2002 Min Chen - * now get Core Version use xvid_init() + * 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 @@ -60,11 +60,10 @@ #include #include -#include // sprintf -#include // XviD API +#include /* sprintf */ +#include /* XviD API */ #include "debug.h" -#include "codec.h" #include "config.h" #include "resource.h" @@ -77,12 +76,14 @@ HINSTANCE g_hInst; HWND g_hTooltip; +int pp_dy, pp_duv, pp_dr, pp_fe; /* decoder options */ + /* enumerates child windows, assigns tooltips */ BOOL CALLBACK enum_tooltips(HWND hWnd, LPARAM lParam) { char help[500]; - if (LoadString(g_hInst, GetDlgCtrlID(hWnd), help, 500)) + if (LoadString(g_hInst, GetDlgCtrlID(hWnd), help, 500)) { TOOLINFO ti; ti.cbSize = sizeof(TOOLINFO); @@ -107,34 +108,38 @@ const profile_t profiles[] = { -/* name p@l, w h fps obj Tvmv vmv vcv ac% vbv pkt kbps flags */ - { "Simple @ L0", 0x08, 176, 144, 15, 1, 198, 99, 1485, 100, 10*16368, 2048, 64, 0 }, - /* simple@l0: max f_code=1, intra_dc_vlc_threshold=0 - /* if ac preidition is used, adaptive quantization must not be used */ - { "Simple @ L1", 0x01, 176, 144, 15, 4, 198, 99, 1485, 100, 10*16368, 2048, 64, PROFILE_ADAPTQUANT }, - { "Simple @ L2", 0x02, 352, 288, 15, 4, 792, 396, 5940, 100, 40*16368, 4096, 128, PROFILE_ADAPTQUANT }, - { "Simple @ L3", 0x03, 352, 288, 15, 4, 792, 396, 11880, 100, 40*16368, 8192, 384, PROFILE_ADAPTQUANT }, - - { "ARTS @ L1", 0x91, 176, 144, 15, 4, 198, 99, 1485, 100, 10*16368, 8192, 64, PROFILE_ARTS }, - { "ARTS @ L2", 0x92, 352, 288, 15, 4, 792, 396, 5940, 100, 40*16368, 16384, 128, PROFILE_ARTS }, - { "ARTS @ L3", 0x93, 352, 288, 30, 4, 792, 396, 11880, 100, 40*16368, 16384, 384, PROFILE_ARTS }, - { "ARTS @ L4", 0x94, 352, 288, 30, 16, 792, 396, 11880, 100, 80*16368, 16384, 2000, PROFILE_ARTS }, - - { "AS @ L0", 0xf0, 176, 144, 30, 1, 297, 99, 2970, 100, 10*16368, 2048, 128, PROFILE_AS }, - { "AS @ L1", 0xf1, 176, 144, 30, 4, 297, 99, 2970, 100, 10*16368, 2048, 128, PROFILE_AS }, - { "AS @ L2", 0xf2, 352, 288, 15, 4, 1188, 396, 5940, 100, 40*16368, 4096, 384, PROFILE_AS }, - { "AS @ L3", 0xf3, 352, 288, 30, 4, 1188, 396, 11880, 100, 40*16368, 4096, 768, PROFILE_AS }, - { "AS @ L4", 0xf4, 352, 576, 30, 4, 2376, 792, 23760, 50, 80*16368, 8192, 3000, PROFILE_AS }, - { "AS @ L5", 0xf5, 720, 576, 30, 4, 4860, 1620, 48600, 25, 112*16368, 16384, 8000, PROFILE_AS }, - - { "DXN Handheld", 0x00, 176, 144, 15, -1, 198, 99, 1485, 100, 16*16368, -1, 128, PROFILE_ADAPTQUANT }, - { "DXN Portable NTSC", 0x00, 352, 240, 30, -1, 990, 330, 9900, 100, 64*16368, -1, 768, PROFILE_ADAPTQUANT|PROFILE_BVOP }, - { "DXN Portable PAL", 0x00, 352, 288, 25, -1, 1188, 396, 9900, 100, 64*16368, -1, 768, PROFILE_ADAPTQUANT|PROFILE_BVOP }, - { "DXN HT NTSC", 0x00, 720, 480, 30, -1, 4050, 1350, 40500, 100, 192*16368, -1, 4000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE }, - { "DXN HT PAL", 0x00, 720, 576, 25, -1, 4860, 1620, 40500, 100, 192*16368, -1, 4000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE }, - { "DXN HDTV", 0x00, 1280, 720, 30, -1,10800, 3600, 108000, 100, 384*16368, -1, 8000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE }, - - { "(unrestricted)", 0x00, 0, 0, 0, 0, 0, 0, 0, 100, 0*16368, 0, 0, 0xffffffff }, +/* name p@l, w h fps obj Tvmv vmv vcv ac% vbv pkt kbps flags */ + { "Simple @ L0", 0x08, 176, 144, 15, 1, 198, 99, 1485, 100, 10*16368, 2048, 64, 0 }, + /* simple@l0: max f_code=1, intra_dc_vlc_threshold=0 */ + /* if ac preidition is used, adaptive quantization must not be used */ + /* <=qcif must be used */ + { "Simple @ L1", 0x01, 176, 144, 15, 4, 198, 99, 1485, 100, 10*16368, 2048, 64, PROFILE_ADAPTQUANT }, + { "Simple @ L2", 0x02, 352, 288, 15, 4, 792, 396, 5940, 100, 40*16368, 4096, 128, PROFILE_ADAPTQUANT }, + { "Simple @ L3", 0x03, 352, 288, 15, 4, 792, 396, 11880, 100, 40*16368, 8192, 384, PROFILE_ADAPTQUANT }, + + { "ARTS @ L1", 0x91, 176, 144, 15, 4, 198, 99, 1485, 100, 10*16368, 8192, 64, PROFILE_ARTS }, + { "ARTS @ L2", 0x92, 352, 288, 15, 4, 792, 396, 5940, 100, 40*16368, 16384, 128, PROFILE_ARTS }, + { "ARTS @ L3", 0x93, 352, 288, 30, 4, 792, 396, 11880, 100, 40*16368, 16384, 384, PROFILE_ARTS }, + { "ARTS @ L4", 0x94, 352, 288, 30, 16, 792, 396, 11880, 100, 80*16368, 16384, 2000, PROFILE_ARTS }, + + { "AS @ L0", 0xf0, 176, 144, 30, 1, 297, 99, 2970, 100, 10*16368, 2048, 128, PROFILE_AS }, + { "AS @ L1", 0xf1, 176, 144, 30, 4, 297, 99, 2970, 100, 10*16368, 2048, 128, PROFILE_AS }, + { "AS @ L2", 0xf2, 352, 288, 15, 4, 1188, 396, 5940, 100, 40*16368, 4096, 384, PROFILE_AS }, + { "AS @ L3", 0xf3, 352, 288, 30, 4, 1188, 396, 11880, 100, 40*16368, 4096, 768, PROFILE_AS }, + /* ISMA Profile 1, (ASP) @ L3b (CIF, 1.5 Mb/s) CIF(352x288), 30fps, 1.5Mbps max ??? */ + { "AS @ L4", 0xf4, 352, 576, 30, 4, 2376, 792, 23760, 50, 80*16368, 8192, 3000, PROFILE_AS }, + { "AS @ L5", 0xf5, 720, 576, 30, 4, 4860, 1620, 48600, 25, 112*16368, 16384, 8000, PROFILE_AS }, + +#ifdef DXN_PROFILES + { "DXN Handheld", 0x00, 176, 144, 15, -1, 198, 99, 1485, 100, 16*16368, -1, 128, PROFILE_ADAPTQUANT }, + { "DXN Portable NTSC", 0x00, 352, 240, 30, -1, 990, 330, 9900, 100, 64*16368, -1, 768, PROFILE_ADAPTQUANT|PROFILE_BVOP }, + { "DXN Portable PAL", 0x00, 352, 288, 25, -1, 1188, 396, 9900, 100, 64*16368, -1, 768, PROFILE_ADAPTQUANT|PROFILE_BVOP }, + { "DXN HT NTSC", 0x00, 720, 480, 30, -1, 4050, 1350, 40500, 100, 192*16368, -1, 4000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE }, + { "DXN HT PAL", 0x00, 720, 576, 25, -1, 4860, 1620, 40500, 100, 192*16368, -1, 4000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE }, + { "DXN HDTV", 0x00, 1280, 720, 30, -1,10800, 3600, 108000, 100, 384*16368, -1, 8000, PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_INTERLACE }, +#endif + + { "(unrestricted)", 0x00, 0, 0, 0, 0, 0, 0, 0, 100, 0*16368, 0, 0, 0xffffffff }, }; @@ -148,79 +153,100 @@ static const REG_INT reg_ints[] = { {"mode", ®.mode, RC_MODE_1PASS}, {"bitrate", ®.bitrate, 700}, + {"desired_size", ®.desired_size, 570000}, + {"use_2pass_bitrate", ®.use_2pass_bitrate, 0}, - {"rc_reaction_delay_factor",®.rc_reaction_delay_factor, 16}, - {"rc_averaging_period", ®.rc_averaging_period, 100}, - {"rc_buffer", ®.rc_buffer, 100}, - - {"motion_search", ®.motion_search, 6}, + /* profile */ {"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}, {"interlacing", ®.interlacing, 0}, {"qpel", ®.qpel, 0}, {"gmc", ®.gmc, 0}, - {"chromame", ®.chromame, 0}, - {"use_bvop", ®.use_bvop, 0}, + {"reduced_resolution", ®.reduced_resolution, 0}, + {"use_bvop", ®.use_bvop, 1}, {"max_bframes", ®.max_bframes, 2}, {"bquant_ratio", ®.bquant_ratio, 150}, /* 100-base float */ {"bquant_offset", ®.bquant_offset, 100}, /* 100-base float */ - {"packed", ®.packed, 0}, + {"packed", ®.packed, 1}, {"closed_gov", ®.closed_gov, 1}, - {"vop_debug", ®.vop_debug, 0}, - {"debug", ®.debug, 0x0}, - {"reduced_resolution", ®.reduced_resolution, 0}, + + /* aspect ratio */ + {"ar_mode", ®.ar_mode, 0}, + {"aspect_ratio", ®.display_aspect_ratio, 0}, + {"par_x", ®.par_x, 1}, + {"par_y", ®.par_y, 1}, + {"ar_x", ®.ar_x, 4}, + {"ar_y", ®.ar_y, 3}, + + /* zones */ + {"num_zones", ®.num_zones, 1}, + + /* single pass */ + {"rc_reaction_delay_factor",®.rc_reaction_delay_factor, 16}, + {"rc_averaging_period", ®.rc_averaging_period, 100}, + {"rc_buffer", ®.rc_buffer, 100}, + + /* 2pass1 */ + {"discard1pass", ®.discard1pass, 1}, + + /* 2pass2 */ + {"keyframe_boost", ®.keyframe_boost, 0}, + {"kfreduction", ®.kfreduction, 20}, + {"kfthreshold", ®.kfthreshold, 1}, + {"curve_compression_high", ®.curve_compression_high, 0}, + {"curve_compression_low", ®.curve_compression_low, 0}, + {"overflow_control_strength", ®.overflow_control_strength, 5}, + {"twopass_max_overflow_improvement", ®.twopass_max_overflow_improvement, 5}, + {"twopass_max_overflow_degradation", ®.twopass_max_overflow_degradation, 5}, + + /* motion */ + {"motion_search", ®.motion_search, 6}, + {"vhq_mode", ®.vhq_mode, 1}, + {"chromame", ®.chromame, 1}, + {"cartoon_mode", ®.cartoon_mode, 0}, + {"turbo", ®.turbo, 0}, + {"max_key_interval", ®.max_key_interval, 300}, {"frame_drop_ratio", ®.frame_drop_ratio, 0}, + /* quant */ {"min_iquant", ®.min_iquant, 2}, {"max_iquant", ®.max_iquant, 31}, {"min_pquant", ®.min_pquant, 2}, {"max_pquant", ®.max_pquant, 31}, {"min_bquant", ®.min_bquant, 2}, {"max_bquant", ®.max_bquant, 31}, - {"trellis_quant", ®.trellis_quant, 0}, + {"trellis_quant", ®.trellis_quant, 0}, - {"desired_size", ®.desired_size, 570000}, - {"keyframe_boost", ®.keyframe_boost, 0}, - {"discard1pass", ®.discard1pass, 1}, - {"kftreshold", ®.kftreshold, 10}, - {"kfreduction", ®.kfreduction, 20}, - {"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}, - {"alt_curve_bonus_bias", ®.alt_curve_bonus_bias, 50}, - {"alt_curve_type", ®.alt_curve_type, 1}, - {"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, 250}, - {"bitrate_payback_method", ®.bitrate_payback_method, 0}, - {"twopass_max_overflow_improvement", ®.twopass_max_overflow_improvement, 60}, - {"twopass_max_overflow_degradation", ®.twopass_max_overflow_degradation, 60}, - {"num_zones", ®.num_zones, 1}, + /* debug */ + {"fourcc_used", ®.fourcc_used, 0}, + {"debug", ®.debug, 0x0}, + {"vop_debug", ®.vop_debug, 0}, + {"display_status", ®.display_status, 1}, + + /* decoder, shared with dshow */ + {"Deblock_Y", &pp_dy, 0}, + {"Deblock_UV", &pp_duv, 0}, + {"Dering", &pp_dr, 0}, + {"FilmEffect", &pp_fe, 0}, + }; static const REG_STR reg_strs[] = { - {"profile", reg.profile_name, "(unrestricted)"}, - {"stats", reg.stats, CONFIG_2PASS_FILE}, + {"profile", reg.profile_name, "(unrestricted)"}, + {"stats", reg.stats, CONFIG_2PASS_FILE}, }; zone_t stmp; static const REG_INT reg_zone[] = { - {"zone%i_frame", &stmp.frame, 0}, - {"zone%i_mode", &stmp.mode, RC_ZONE_WEIGHT}, - {"zone%i_weight", &stmp.weight, 100}, /* 100-base float */ - {"zone%i_quant", &stmp.quant, 500}, /* 100-base float */ - {"zone%i_greyscale", &stmp.greyscale, 0}, - {"zone%i_chroma_opt", &stmp.chroma_opt, 0}, - {"zone%i_bvop_threshold", &stmp.bvop_threshold, 0}, + {"zone%i_frame", &stmp.frame, 0}, + {"zone%i_mode", &stmp.mode, RC_ZONE_WEIGHT}, + {"zone%i_weight", &stmp.weight, 100}, /* 100-base float */ + {"zone%i_quant", &stmp.quant, 500}, /* 100-base float */ + {"zone%i_type", &stmp.type, XVID_TYPE_AUTO}, + {"zone%i_greyscale", &stmp.greyscale, 0}, + {"zone%i_chroma_opt", &stmp.chroma_opt, 0}, + {"zone%i_bvop_threshold", &stmp.bvop_threshold, 0}, }; static const BYTE default_qmatrix_intra[] = { @@ -249,31 +275,43 @@ #define REG_GET_B(X, Y, Z) size=sizeof((Z));if(RegQueryValueEx(hKey, X, 0, 0, Y, &size) != ERROR_SUCCESS) {memcpy(Y, Z, sizeof((Z)));} +#define XVID_DLL_NAME "xvidcore.dll" + void config_reg_get(CONFIG * config) { - char tmp[32]; - HKEY hKey; + char tmp[32]; + HKEY hKey; DWORD size; - int i,j; + int i,j; xvid_gbl_info_t info; + HINSTANCE m_hdll; memset(&info, 0, sizeof(info)); info.version = XVID_VERSION; - xvid_global(0, XVID_GBL_INFO, &info, NULL); + + m_hdll = LoadLibrary(XVID_DLL_NAME); + if (m_hdll != NULL) { + + ((int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_global")) + (0, XVID_GBL_INFO, &info, NULL); + + FreeLibrary(m_hdll); + } + reg.cpu = info.cpu_flags; reg.num_threads = info.num_threads; - + RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey); - /* read integer values */ + /* read integer values */ for (i=0 ; iqmatrix_intra, default_qmatrix_intra); REG_GET_B("qmatrix_inter", config->qmatrix_inter, default_qmatrix_inter); - - /* read zones */ - if (config->num_zones>MAX_ZONES) { - config->num_zones=MAX_ZONES; - }else if (config->num_zones<=0) { - config->num_zones = 1; - } - - for (i=0; inum_zones; i++) { - for (j=0; jzones[i], &stmp, sizeof(zone_t)); - } + /* read zones */ + if (config->num_zones>MAX_ZONES) { + config->num_zones=MAX_ZONES; + }else if (config->num_zones<=0) { + config->num_zones = 1; + } + + for (i=0; inum_zones; i++) { + for (j=0; jzones[i], &stmp, sizeof(zone_t)); + } RegCloseKey(hKey); } @@ -325,8 +363,8 @@ void config_reg_set(CONFIG * config) { - char tmp[64]; - HKEY hKey; + char tmp[64]; + HKEY hKey; DWORD dispo; int i,j; @@ -337,8 +375,8 @@ XVID_REG_CLASS, REG_OPTION_NON_VOLATILE, KEY_WRITE, - 0, - &hKey, + 0, + &hKey, &dispo) != ERROR_SUCCESS) { DPRINTF("Couldn't create XVID_REG_SUBKEY - GetLastError=%i", GetLastError()); @@ -347,29 +385,29 @@ memcpy(®, config, sizeof(CONFIG)); - /* set integer values */ + /* set integer values */ for (i=0 ; iqmatrix_intra); REG_SET_B("qmatrix_inter", config->qmatrix_inter); - /* set seections */ - for (i=0; inum_zones; i++) { - memcpy(&stmp, &config->zones[i], sizeof(zone_t)); - for (j=0; jnum_zones; i++) { + memcpy(&stmp, &config->zones[i], sizeof(zone_t)); + for (j=0; jcur_zone>0 && config->ci_valid && config->ci.ciActiveFrame>0); - break; + break; + + case IDD_ZONE : + EnableDlgWindow(hDlg, IDC_ZONE_FETCH, config->ci_valid); + break; - case IDD_MOTION : + case IDD_MOTION : SendDlgItemMessage(hDlg, IDC_MOTION, CB_ADDSTRING, 0, (LPARAM)"0 - None"); SendDlgItemMessage(hDlg, IDC_MOTION, CB_ADDSTRING, 0, (LPARAM)"1 - Very Low"); SendDlgItemMessage(hDlg, IDC_MOTION, CB_ADDSTRING, 0, (LPARAM)"2 - Low"); @@ -651,9 +691,9 @@ 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"); - break; + break; - case IDD_DEBUG : + case IDD_DEBUG : /* force threads disabled */ EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS_STATIC), FALSE); EnableWindow(GetDlgItem(hDlg, IDC_NUMTHREADS), FALSE); @@ -661,8 +701,8 @@ 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"); - break; - } + break; + } } @@ -670,97 +710,111 @@ void adv_mode(HWND hDlg, int idd, CONFIG * config) { - int profile; - int use_alt, use_alt_auto, use_alt_auto_bonus; - int weight_en, quant_en; - int cpu_force; - int custom_quant, bvops; - - switch(idd) { - case IDD_PROFILE : - profile = SendDlgItemMessage(hDlg, IDC_PROFILE_PROFILE, CB_GETCURSEL, 0, 0); - EnableDlgWindow(hDlg, IDC_BVOP, profiles[profile].flags&PROFILE_BVOP); - - EnableDlgWindow(hDlg, IDC_QUANTTYPE_S, profiles[profile].flags&PROFILE_MPEGQUANT); - EnableDlgWindow(hDlg, IDC_QUANTTYPE_S, profiles[profile].flags&PROFILE_MPEGQUANT); - EnableDlgWindow(hDlg, IDC_QUANTTYPE, profiles[profile].flags&PROFILE_MPEGQUANT); - custom_quant = (profiles[profile].flags&PROFILE_MPEGQUANT) && SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_GETCURSEL, 0, 0)==QUANT_MODE_CUSTOM; - EnableDlgWindow(hDlg, IDC_QUANTMATRIX, custom_quant); - EnableDlgWindow(hDlg, IDC_LUMMASK, profiles[profile].flags&PROFILE_ADAPTQUANT); - EnableDlgWindow(hDlg, IDC_INTERLACING, profiles[profile].flags&PROFILE_INTERLACE); - EnableDlgWindow(hDlg, IDC_QPEL, profiles[profile].flags&PROFILE_QPEL); - EnableDlgWindow(hDlg, IDC_GMC, profiles[profile].flags&PROFILE_GMC); - EnableDlgWindow(hDlg, IDC_REDUCED, profiles[profile].flags&PROFILE_REDUCED); - - bvops = (profiles[profile].flags&PROFILE_BVOP) && IsDlgChecked(hDlg, IDC_BVOP); - EnableDlgWindow(hDlg, IDC_MAXBFRAMES, bvops); - EnableDlgWindow(hDlg, IDC_BQUANTRATIO, bvops); - EnableDlgWindow(hDlg, IDC_BQUANTOFFSET, bvops); - EnableDlgWindow(hDlg, IDC_MAXBFRAMES_S, bvops); - EnableDlgWindow(hDlg, IDC_BQUANTRATIO_S, bvops); + int profile; + int weight_en, quant_en; + int cpu_force; + int custom_quant, bvops; + int ar_mode, ar_par; + + switch(idd) { + case IDD_PROFILE : + profile = SendDlgItemMessage(hDlg, IDC_PROFILE_PROFILE, CB_GETCURSEL, 0, 0); + EnableDlgWindow(hDlg, IDC_BVOP, profiles[profile].flags&PROFILE_BVOP); + + EnableDlgWindow(hDlg, IDC_QUANTTYPE_S, profiles[profile].flags&PROFILE_MPEGQUANT); + EnableDlgWindow(hDlg, IDC_QUANTTYPE_S, profiles[profile].flags&PROFILE_MPEGQUANT); + EnableDlgWindow(hDlg, IDC_QUANTTYPE, profiles[profile].flags&PROFILE_MPEGQUANT); + custom_quant = (profiles[profile].flags&PROFILE_MPEGQUANT) && SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_GETCURSEL, 0, 0)==QUANT_MODE_CUSTOM; + EnableDlgWindow(hDlg, IDC_QUANTMATRIX, custom_quant); + EnableDlgWindow(hDlg, IDC_LUMMASK, profiles[profile].flags&PROFILE_ADAPTQUANT); + EnableDlgWindow(hDlg, IDC_INTERLACING, profiles[profile].flags&PROFILE_INTERLACE); + EnableDlgWindow(hDlg, IDC_QPEL, profiles[profile].flags&PROFILE_QPEL); + EnableDlgWindow(hDlg, IDC_GMC, profiles[profile].flags&PROFILE_GMC); + EnableDlgWindow(hDlg, IDC_REDUCED, profiles[profile].flags&PROFILE_REDUCED); + + bvops = (profiles[profile].flags&PROFILE_BVOP) && IsDlgChecked(hDlg, IDC_BVOP); + EnableDlgWindow(hDlg, IDC_MAXBFRAMES, bvops); + EnableDlgWindow(hDlg, IDC_BQUANTRATIO, bvops); + EnableDlgWindow(hDlg, IDC_BQUANTOFFSET, bvops); + EnableDlgWindow(hDlg, IDC_MAXBFRAMES_S, bvops); + EnableDlgWindow(hDlg, IDC_BQUANTRATIO_S, bvops); EnableDlgWindow(hDlg, IDC_BQUANTOFFSET_S, bvops); - EnableDlgWindow(hDlg, IDC_PACKED, bvops); - EnableDlgWindow(hDlg, IDC_CLOSEDGOV, bvops); + EnableDlgWindow(hDlg, IDC_PACKED, bvops); + EnableDlgWindow(hDlg, IDC_CLOSEDGOV, bvops); + break; + + case IDD_AR: + ar_mode = IsDlgChecked(hDlg, IDC_PAR); + EnableDlgWindow(hDlg, IDC_ASPECT_RATIO, ar_mode); + + ar_par = SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_GETCURSEL, 0, 0); + if (ar_par == 5) { /* custom par */ + SetDlgItemInt(hDlg, IDC_PARY, config->par_y, FALSE); + SetDlgItemInt(hDlg, IDC_PARX, config->par_x, FALSE); + + EnableDlgWindow(hDlg, IDC_PARX, ar_mode); + EnableDlgWindow(hDlg, IDC_PARY, ar_mode); + } else { + SetDlgItemInt(hDlg, IDC_PARX, PARS[ar_par][0], FALSE); + SetDlgItemInt(hDlg, IDC_PARY, PARS[ar_par][1], FALSE); + EnableDlgWindow(hDlg, IDC_PARX, FALSE); + EnableDlgWindow(hDlg, IDC_PARY, FALSE); + } - case IDD_LEVEL : - profile = SendDlgItemMessage(hDlg, IDC_LEVEL_PROFILE, CB_GETCURSEL, 0, 0); - SetDlgItemInt(hDlg, IDC_LEVEL_WIDTH, profiles[profile].width, FALSE); - SetDlgItemInt(hDlg, IDC_LEVEL_HEIGHT, profiles[profile].height, FALSE); - SetDlgItemInt(hDlg, IDC_LEVEL_FPS, profiles[profile].fps, FALSE); - SetDlgItemInt(hDlg, IDC_LEVEL_VMV, profiles[profile].max_vmv_buffer_sz, FALSE); - SetDlgItemInt(hDlg, IDC_LEVEL_VCV, profiles[profile].vcv_decoder_rate, FALSE); - SetDlgItemInt(hDlg, IDC_LEVEL_VBV, profiles[profile].max_vbv_size, FALSE); - SetDlgItemInt(hDlg, IDC_LEVEL_BITRATE, profiles[profile].max_bitrate, FALSE); - break; - - case IDD_RC_2PASS2_ALT : - use_alt = IsDlgChecked(hDlg, IDC_USEALT); - use_alt_auto = IsDlgChecked(hDlg, IDC_USEAUTO); - use_alt_auto_bonus = IsDlgChecked(hDlg, IDC_USEAUTOBONUS); - EnableDlgWindow(hDlg, IDC_USEAUTO, use_alt); - EnableDlgWindow(hDlg, IDC_AUTOSTR, use_alt && use_alt_auto); - EnableDlgWindow(hDlg, IDC_USEAUTOBONUS, use_alt); - EnableDlgWindow(hDlg, IDC_BONUSBIAS, use_alt && !use_alt_auto_bonus); - EnableDlgWindow(hDlg, IDC_CURVETYPE, use_alt); - EnableDlgWindow(hDlg, IDC_ALTCURVEHIGH, use_alt); - EnableDlgWindow(hDlg, IDC_ALTCURVELOW, use_alt); - EnableDlgWindow(hDlg, IDC_MINQUAL, use_alt && !use_alt_auto); - break; - - case IDD_ZONE : - weight_en = IsDlgChecked(hDlg, IDC_ZONE_MODE_WEIGHT); - quant_en = IsDlgChecked(hDlg, IDC_ZONE_MODE_QUANT); - EnableDlgWindow(hDlg, IDC_ZONE_WEIGHT, weight_en); - EnableDlgWindow(hDlg, IDC_ZONE_QUANT, quant_en); - EnableDlgWindow(hDlg, IDC_ZONE_SLIDER, weight_en|quant_en); - - if (weight_en) { - SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETRANGE, TRUE, MAKELONG(001,200)); - SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETPOS, TRUE, get_dlgitem_float(hDlg, IDC_ZONE_WEIGHT, 100)); - SetDlgItemText(hDlg, IDC_ZONE_MIN, "0.01"); - SetDlgItemText(hDlg, IDC_ZONE_MAX, "2.00"); - }else if (quant_en) { - SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETRANGE, TRUE, MAKELONG(100,3100)); - SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETPOS, TRUE, get_dlgitem_float(hDlg, IDC_ZONE_QUANT, 100)); - SetDlgItemText(hDlg, IDC_ZONE_MIN, "1"); - SetDlgItemText(hDlg, IDC_ZONE_MAX, "31"); - } - - bvops = (profiles[config->profile].flags&PROFILE_BVOP) && config->use_bvop; - EnableDlgWindow(hDlg, IDC_ZONE_BVOPTHRESHOLD_S, bvops); - EnableDlgWindow(hDlg, IDC_ZONE_BVOPTHRESHOLD, bvops); - break; - - case IDD_DEBUG : - cpu_force = IsDlgChecked(hDlg, IDC_CPU_FORCE); - EnableDlgWindow(hDlg, IDC_CPU_MMX, cpu_force); - EnableDlgWindow(hDlg, IDC_CPU_MMXEXT, cpu_force); - EnableDlgWindow(hDlg, IDC_CPU_SSE, cpu_force); - EnableDlgWindow(hDlg, IDC_CPU_SSE2, cpu_force); - EnableDlgWindow(hDlg, IDC_CPU_3DNOW, cpu_force); - EnableDlgWindow(hDlg, IDC_CPU_3DNOWEXT, cpu_force); - break; - } + ar_mode = IsDlgChecked(hDlg, IDC_AR); + + config->ar_x = config_get_uint(hDlg, IDC_ARX, config->ar_x); + config->ar_y = config_get_uint(hDlg, IDC_ARY, config->ar_y); + + EnableDlgWindow(hDlg, IDC_ARX, ar_mode); + EnableDlgWindow(hDlg, IDC_ARY, ar_mode); + break; + + case IDD_LEVEL : + profile = SendDlgItemMessage(hDlg, IDC_LEVEL_PROFILE, CB_GETCURSEL, 0, 0); + SetDlgItemInt(hDlg, IDC_LEVEL_WIDTH, profiles[profile].width, FALSE); + SetDlgItemInt(hDlg, IDC_LEVEL_HEIGHT, profiles[profile].height, FALSE); + SetDlgItemInt(hDlg, IDC_LEVEL_FPS, profiles[profile].fps, FALSE); + SetDlgItemInt(hDlg, IDC_LEVEL_VMV, profiles[profile].max_vmv_buffer_sz, FALSE); + SetDlgItemInt(hDlg, IDC_LEVEL_VCV, profiles[profile].vcv_decoder_rate, FALSE); + SetDlgItemInt(hDlg, IDC_LEVEL_VBV, profiles[profile].max_vbv_size, FALSE); + SetDlgItemInt(hDlg, IDC_LEVEL_BITRATE, profiles[profile].max_bitrate, FALSE); + break; + + case IDD_ZONE : + weight_en = IsDlgChecked(hDlg, IDC_ZONE_MODE_WEIGHT); + quant_en = IsDlgChecked(hDlg, IDC_ZONE_MODE_QUANT); + EnableDlgWindow(hDlg, IDC_ZONE_WEIGHT, weight_en); + EnableDlgWindow(hDlg, IDC_ZONE_QUANT, quant_en); + EnableDlgWindow(hDlg, IDC_ZONE_SLIDER, weight_en|quant_en); + + if (weight_en) { + SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETRANGE, TRUE, MAKELONG(001,200)); + SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETPOS, TRUE, get_dlgitem_float(hDlg, IDC_ZONE_WEIGHT, 100)); + SetDlgItemText(hDlg, IDC_ZONE_MIN, "0.01"); + SetDlgItemText(hDlg, IDC_ZONE_MAX, "2.00"); + }else if (quant_en) { + SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETRANGE, TRUE, MAKELONG(100,3100)); + SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETPOS, TRUE, get_dlgitem_float(hDlg, IDC_ZONE_QUANT, 100)); + SetDlgItemText(hDlg, IDC_ZONE_MIN, "1"); + SetDlgItemText(hDlg, IDC_ZONE_MAX, "31"); + } + + bvops = (profiles[config->profile].flags&PROFILE_BVOP) && config->use_bvop; + EnableDlgWindow(hDlg, IDC_ZONE_BVOPTHRESHOLD_S, bvops); + EnableDlgWindow(hDlg, IDC_ZONE_BVOPTHRESHOLD, bvops); + break; + + case IDD_DEBUG : + cpu_force = IsDlgChecked(hDlg, IDC_CPU_FORCE); + EnableDlgWindow(hDlg, IDC_CPU_MMX, cpu_force); + EnableDlgWindow(hDlg, IDC_CPU_MMXEXT, cpu_force); + EnableDlgWindow(hDlg, IDC_CPU_SSE, cpu_force); + EnableDlgWindow(hDlg, IDC_CPU_SSE2, cpu_force); + EnableDlgWindow(hDlg, IDC_CPU_3DNOW, cpu_force); + EnableDlgWindow(hDlg, IDC_CPU_3DNOWEXT, cpu_force); + break; + } } @@ -772,24 +826,31 @@ case IDD_PROFILE : SendDlgItemMessage(hDlg, IDC_PROFILE_PROFILE, CB_SETCURSEL, config->profile, 0); - SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_SETCURSEL, config->quant_type, 0); - CheckDlg(hDlg, IDC_LUMMASK, config->lum_masking); + SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_SETCURSEL, config->quant_type, 0); + CheckDlg(hDlg, IDC_LUMMASK, config->lum_masking); CheckDlg(hDlg, IDC_INTERLACING, config->interlacing); - CheckDlg(hDlg, IDC_QPEL, config->qpel); + CheckDlg(hDlg, IDC_QPEL, config->qpel); CheckDlg(hDlg, IDC_GMC, config->gmc); - CheckDlg(hDlg, IDC_REDUCED, config->reduced_resolution); - CheckDlg(hDlg, IDC_BVOP, config->use_bvop); - - SetDlgItemInt(hDlg, IDC_MAXBFRAMES, config->max_bframes, FALSE); - set_dlgitem_float(hDlg, IDC_BQUANTRATIO, config->bquant_ratio); + CheckDlg(hDlg, IDC_REDUCED, config->reduced_resolution); + CheckDlg(hDlg, IDC_BVOP, config->use_bvop); + + SetDlgItemInt(hDlg, IDC_MAXBFRAMES, config->max_bframes, FALSE); + set_dlgitem_float(hDlg, IDC_BQUANTRATIO, config->bquant_ratio); set_dlgitem_float(hDlg, IDC_BQUANTOFFSET, config->bquant_offset); - CheckDlg(hDlg, IDC_PACKED, config->packed); + CheckDlg(hDlg, IDC_PACKED, config->packed); CheckDlg(hDlg, IDC_CLOSEDGOV, config->closed_gov); + + break; + case IDD_AR: + CheckRadioButton(hDlg, IDC_AR, IDC_PAR, config->ar_mode == 0 ? IDC_PAR : IDC_AR); + SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_SETCURSEL, (config->display_aspect_ratio), 0); + SetDlgItemInt(hDlg, IDC_ARX, config->ar_x, FALSE); + SetDlgItemInt(hDlg, IDC_ARY, config->ar_y, FALSE); break; - case IDD_LEVEL : - SendDlgItemMessage(hDlg, IDC_LEVEL_PROFILE, CB_SETCURSEL, config->profile, 0); - break; + case IDD_LEVEL : + SendDlgItemMessage(hDlg, IDC_LEVEL_PROFILE, CB_SETCURSEL, config->profile, 0); + break; case IDD_RC_CBR : SetDlgItemInt(hDlg, IDC_CBR_REACTIONDELAY, config->rc_reaction_delay_factor, FALSE); @@ -797,68 +858,51 @@ SetDlgItemInt(hDlg, IDC_CBR_BUFFER, config->rc_buffer, FALSE); break; - case IDD_RC_2PASS1 : - SetDlgItemText(hDlg, IDC_STATS, config->stats); - CheckDlg(hDlg, IDC_DISCARD1PASS, config->discard1pass); - break; + case IDD_RC_2PASS1 : + SetDlgItemText(hDlg, IDC_STATS, config->stats); + CheckDlg(hDlg, IDC_DISCARD1PASS, config->discard1pass); + break; case IDD_RC_2PASS2 : SetDlgItemText(hDlg, IDC_STATS, config->stats); - SetDlgItemInt(hDlg, IDC_KFBOOST, config->keyframe_boost, FALSE); - SetDlgItemInt(hDlg, IDC_KFTRESHOLD, config->kftreshold, FALSE); + SetDlgItemInt(hDlg, IDC_KFBOOST, config->keyframe_boost, FALSE); SetDlgItemInt(hDlg, IDC_KFREDUCTION, config->kfreduction, FALSE); - SetDlgItemInt(hDlg, IDC_OVERIMP, config->twopass_max_overflow_improvement, FALSE); + SetDlgItemInt(hDlg, IDC_OVERFLOW_CONTROL_STRENGTH, config->overflow_control_strength, FALSE); + SetDlgItemInt(hDlg, IDC_OVERIMP, config->twopass_max_overflow_improvement, FALSE); SetDlgItemInt(hDlg, IDC_OVERDEG, config->twopass_max_overflow_degradation, FALSE); 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); - CheckDlgButton(hDlg, IDC_PAYBACKBIAS, (config->bitrate_payback_method == 0)); - CheckDlgButton(hDlg, IDC_PAYBACKPROP, (config->bitrate_payback_method == 1)); + SetDlgItemInt(hDlg, IDC_MINKEY, config->kfthreshold, FALSE); break; - case IDD_RC_2PASS2_ALT : - CheckDlg(hDlg, IDC_USEALT, config->use_alt_curve); + case IDD_ZONE : + SetDlgItemInt(hDlg, IDC_ZONE_FRAME, config->zones[config->cur_zone].frame, FALSE); - SendDlgItemMessage(hDlg, IDC_CURVETYPE, CB_SETCURSEL, config->alt_curve_type, 0); - SetDlgItemInt(hDlg, IDC_ALTCURVEHIGH, config->alt_curve_high_dist, FALSE); - SetDlgItemInt(hDlg, IDC_ALTCURVELOW, config->alt_curve_low_dist, FALSE); - SetDlgItemInt(hDlg, IDC_MINQUAL, config->alt_curve_min_rel_qual, FALSE); + CheckDlgButton(hDlg, IDC_ZONE_MODE_WEIGHT, config->zones[config->cur_zone].mode == RC_ZONE_WEIGHT); + CheckDlgButton(hDlg, IDC_ZONE_MODE_QUANT, config->zones[config->cur_zone].mode == RC_ZONE_QUANT); - CheckDlg(hDlg, IDC_USEAUTO, config->alt_curve_use_auto); - SetDlgItemInt(hDlg, IDC_AUTOSTR, config->alt_curve_auto_str, FALSE); + set_dlgitem_float(hDlg, IDC_ZONE_WEIGHT, config->zones[config->cur_zone].weight); + set_dlgitem_float(hDlg, IDC_ZONE_QUANT, config->zones[config->cur_zone].quant); + + CheckDlgButton(hDlg, IDC_ZONE_FORCEIVOP, config->zones[config->cur_zone].type==XVID_TYPE_IVOP); + CheckDlgButton(hDlg, IDC_ZONE_GREYSCALE, config->zones[config->cur_zone].greyscale); + CheckDlgButton(hDlg, IDC_ZONE_CHROMAOPT, config->zones[config->cur_zone].chroma_opt); - CheckDlg(hDlg, IDC_USEAUTOBONUS, config->alt_curve_use_auto_bonus_bias); - SetDlgItemInt(hDlg, IDC_BONUSBIAS, config->alt_curve_bonus_bias, FALSE); + SetDlgItemInt(hDlg, IDC_ZONE_BVOPTHRESHOLD, config->zones[config->cur_zone].bvop_threshold, TRUE); break; - case IDD_ZONE : - SetDlgItemInt(hDlg, IDC_ZONE_FRAME, config->zones[config->cur_zone].frame, FALSE); - SendDlgItemMessage(hDlg, IDC_ZONE_FRAME, EM_SETREADONLY, config->cur_zone==0?TRUE:FALSE, 0); - - CheckDlgButton(hDlg, IDC_ZONE_MODE_WEIGHT, config->zones[config->cur_zone].mode == RC_ZONE_WEIGHT); - CheckDlgButton(hDlg, IDC_ZONE_MODE_QUANT, config->zones[config->cur_zone].mode == RC_ZONE_QUANT); - - set_dlgitem_float(hDlg, IDC_ZONE_WEIGHT, config->zones[config->cur_zone].weight); - set_dlgitem_float(hDlg, IDC_ZONE_QUANT, config->zones[config->cur_zone].quant); - - - CheckDlgButton(hDlg, IDC_ZONE_GREYSCALE, config->zones[config->cur_zone].greyscale); - CheckDlgButton(hDlg, IDC_ZONE_CHROMAOPT, config->zones[config->cur_zone].chroma_opt); - - SetDlgItemInt(hDlg, IDC_ZONE_BVOPTHRESHOLD, config->zones[config->cur_zone].bvop_threshold, TRUE); - break; - case IDD_MOTION : SendDlgItemMessage(hDlg, IDC_MOTION, CB_SETCURSEL, config->motion_search, 0); SendDlgItemMessage(hDlg, IDC_VHQ, CB_SETCURSEL, config->vhq_mode, 0); - CheckDlg(hDlg, IDC_CHROMAME, config->chromame); + CheckDlg(hDlg, IDC_CHROMAME, config->chromame); + CheckDlg(hDlg, IDC_CARTOON, config->cartoon_mode); + CheckDlg(hDlg, IDC_TURBO, config->turbo); SetDlgItemInt(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio, FALSE); SetDlgItemInt(hDlg, IDC_MAXKEY, config->max_key_interval, FALSE); - SetDlgItemInt(hDlg, IDC_MINKEY, config->min_key_interval, FALSE); - break; - + break; + case IDD_QUANT : SetDlgItemInt(hDlg, IDC_MINIQUANT, config->min_iquant, FALSE); SetDlgItemInt(hDlg, IDC_MAXIQUANT, config->max_iquant, FALSE); @@ -866,7 +910,7 @@ SetDlgItemInt(hDlg, IDC_MAXPQUANT, config->max_pquant, FALSE); SetDlgItemInt(hDlg, IDC_MINBQUANT, config->min_bquant, FALSE); SetDlgItemInt(hDlg, IDC_MAXBQUANT, config->max_bquant, FALSE); - CheckDlg(hDlg, IDC_TRELLISQUANT, config->trellis_quant); + CheckDlg(hDlg, IDC_TRELLISQUANT, config->trellis_quant); break; case IDD_DEBUG : @@ -877,14 +921,22 @@ CheckDlg(hDlg, IDC_CPU_3DNOW, (config->cpu & XVID_CPU_3DNOW)); CheckDlg(hDlg, IDC_CPU_3DNOWEXT, (config->cpu & XVID_CPU_3DNOWEXT)); - CheckRadioButton(hDlg, IDC_CPU_AUTO, IDC_CPU_FORCE, + CheckRadioButton(hDlg, IDC_CPU_AUTO, IDC_CPU_FORCE, config->cpu & XVID_CPU_FORCE ? IDC_CPU_FORCE : IDC_CPU_AUTO ); SetDlgItemInt(hDlg, IDC_NUMTHREADS, config->num_threads, FALSE); - CheckDlg(hDlg, IDC_VOPDEBUG, config->vop_debug); - set_dlgitem_hex(hDlg, IDC_DEBUG, config->debug); SendDlgItemMessage(hDlg, IDC_FOURCC, CB_SETCURSEL, config->fourcc_used, 0); + set_dlgitem_hex(hDlg, IDC_DEBUG, config->debug); + CheckDlg(hDlg, IDC_VOPDEBUG, config->vop_debug); + CheckDlg(hDlg, IDC_DISPLAY_STATUS, config->display_status); + break; + + case IDD_DEC : + CheckDlg(hDlg, IDC_DEC_DY, pp_dy); + CheckDlg(hDlg, IDC_DEC_DUV, pp_duv); + CheckDlg(hDlg, IDC_DEC_DR, pp_dr); + CheckDlg(hDlg, IDC_DEC_FE, pp_fe); break; } } @@ -899,14 +951,14 @@ case IDD_PROFILE : config->profile = SendDlgItemMessage(hDlg, IDC_PROFILE_PROFILE, CB_GETCURSEL, 0, 0); - config->quant_type = SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_GETCURSEL, 0, 0); - config->lum_masking = IsDlgChecked(hDlg, IDC_LUMMASK); + config->quant_type = SendDlgItemMessage(hDlg, IDC_QUANTTYPE, CB_GETCURSEL, 0, 0); + config->lum_masking = IsDlgChecked(hDlg, IDC_LUMMASK); config->interlacing = IsDlgChecked(hDlg, IDC_INTERLACING); - config->qpel = IsDlgChecked(hDlg, IDC_QPEL); + config->qpel = IsDlgChecked(hDlg, IDC_QPEL); config->gmc = IsDlgChecked(hDlg, IDC_GMC); config->reduced_resolution = IsDlgChecked(hDlg, IDC_REDUCED); - config->use_bvop = IsDlgChecked(hDlg, IDC_BVOP); + config->use_bvop = IsDlgChecked(hDlg, IDC_BVOP); config->max_bframes = config_get_uint(hDlg, IDC_MAXBFRAMES, config->max_bframes); config->bquant_ratio = get_dlgitem_float(hDlg, IDC_BQUANTRATIO, config->bquant_ratio); config->bquant_offset = get_dlgitem_float(hDlg, IDC_BQUANTOFFSET, config->bquant_offset); @@ -914,9 +966,20 @@ config->closed_gov = IsDlgChecked(hDlg, IDC_CLOSEDGOV); break; - case IDD_LEVEL : - config->profile = SendDlgItemMessage(hDlg, IDC_LEVEL_PROFILE, CB_GETCURSEL, 0, 0); - break; + case IDD_AR: + config->ar_mode = IsDlgChecked(hDlg, IDC_PAR) ? 0:1; + config->ar_x = config_get_uint(hDlg, IDC_ARX, config->ar_x); + config->ar_y = config_get_uint(hDlg, IDC_ARY, config->ar_y); + config->display_aspect_ratio = SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_GETCURSEL, 0, 0); + if (config->display_aspect_ratio == 5) { + config->par_x = config_get_uint(hDlg, IDC_PARX, config->par_x); + config->par_y = config_get_uint(hDlg, IDC_PARY, config->par_y); + } + break; + + case IDD_LEVEL : + config->profile = SendDlgItemMessage(hDlg, IDC_LEVEL_PROFILE, CB_GETCURSEL, 0, 0); + break; case IDD_RC_CBR : config->rc_reaction_delay_factor = config_get_uint(hDlg, IDC_CBR_REACTIONDELAY, config->rc_reaction_delay_factor); @@ -925,77 +988,64 @@ break; case IDD_RC_2PASS1 : - if (GetDlgItemText(hDlg, IDC_STATS, config->stats, MAX_PATH) == 0) + if (GetDlgItemText(hDlg, IDC_STATS, config->stats, MAX_PATH) == 0) lstrcpy(config->stats, CONFIG_2PASS_FILE); - config->discard1pass = IsDlgChecked(hDlg, IDC_DISCARD1PASS); - break; + config->discard1pass = IsDlgChecked(hDlg, IDC_DISCARD1PASS); + break; - case IDD_RC_2PASS2 : - if (GetDlgItemText(hDlg, IDC_STATS, config->stats, MAX_PATH) == 0) + case IDD_RC_2PASS2 : + if (GetDlgItemText(hDlg, IDC_STATS, config->stats, MAX_PATH) == 0) lstrcpy(config->stats, CONFIG_2PASS_FILE); - config->keyframe_boost = GetDlgItemInt(hDlg, IDC_KFBOOST, NULL, FALSE); - config->kftreshold = GetDlgItemInt(hDlg, IDC_KFTRESHOLD, NULL, FALSE); + config->keyframe_boost = GetDlgItemInt(hDlg, IDC_KFBOOST, NULL, FALSE); config->kfreduction = GetDlgItemInt(hDlg, IDC_KFREDUCTION, NULL, FALSE); + CONSTRAINVAL(config->keyframe_boost, 0, 1000); + config->overflow_control_strength = GetDlgItemInt(hDlg, IDC_OVERFLOW_CONTROL_STRENGTH, NULL, FALSE); 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); - + CONSTRAINVAL(config->overflow_control_strength, 0, 100); + 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_uint(hDlg, IDC_PAYBACK, config->bitrate_payback_delay); - config->bitrate_payback_method = IsDlgChecked(hDlg, IDC_PAYBACKPROP); - - CONSTRAINVAL(config->bitrate_payback_delay, 1, 10000); - CONSTRAINVAL(config->keyframe_boost, 0, 1000); CONSTRAINVAL(config->curve_compression_high, 0, 100); CONSTRAINVAL(config->curve_compression_low, 0, 100); - break; - - case IDD_RC_2PASS2_ALT : - config->use_alt_curve = IsDlgChecked(hDlg, IDC_USEALT); - config->alt_curve_use_auto = IsDlgChecked(hDlg, IDC_USEAUTO); - config->alt_curve_auto_str = config_get_uint(hDlg, IDC_AUTOSTR, config->alt_curve_auto_str); + config->kfthreshold = config_get_uint(hDlg, IDC_MINKEY, config->kfthreshold); - config->alt_curve_use_auto_bonus_bias = IsDlgChecked(hDlg, IDC_USEAUTOBONUS); - 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_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); break; - case IDD_ZONE : - config->zones[config->cur_zone].frame = config_get_uint(hDlg, IDC_ZONE_FRAME, config->zones[config->cur_zone].frame); + case IDD_ZONE : + config->zones[config->cur_zone].frame = config_get_uint(hDlg, IDC_ZONE_FRAME, config->zones[config->cur_zone].frame); - if (IsDlgChecked(hDlg, IDC_ZONE_MODE_WEIGHT)) { - config->zones[config->cur_zone].mode = RC_ZONE_WEIGHT; - }else if (IsDlgChecked(hDlg, IDC_ZONE_MODE_QUANT)) { - config->zones[config->cur_zone].mode = RC_ZONE_QUANT; - } + if (IsDlgChecked(hDlg, IDC_ZONE_MODE_WEIGHT)) { + config->zones[config->cur_zone].mode = RC_ZONE_WEIGHT; + }else if (IsDlgChecked(hDlg, IDC_ZONE_MODE_QUANT)) { + config->zones[config->cur_zone].mode = RC_ZONE_QUANT; + } - config->zones[config->cur_zone].weight = get_dlgitem_float(hDlg, IDC_ZONE_WEIGHT, config->zones[config->cur_zone].weight); - config->zones[config->cur_zone].quant = get_dlgitem_float(hDlg, IDC_ZONE_QUANT, config->zones[config->cur_zone].quant); + config->zones[config->cur_zone].weight = get_dlgitem_float(hDlg, IDC_ZONE_WEIGHT, config->zones[config->cur_zone].weight); + config->zones[config->cur_zone].quant = get_dlgitem_float(hDlg, IDC_ZONE_QUANT, config->zones[config->cur_zone].quant); - config->zones[config->cur_zone].greyscale = IsDlgButtonChecked(hDlg, IDC_ZONE_GREYSCALE); - config->zones[config->cur_zone].chroma_opt = IsDlgButtonChecked(hDlg, IDC_ZONE_CHROMAOPT); + config->zones[config->cur_zone].type = IsDlgButtonChecked(hDlg, IDC_ZONE_FORCEIVOP)?XVID_TYPE_IVOP:XVID_TYPE_AUTO; + config->zones[config->cur_zone].greyscale = IsDlgButtonChecked(hDlg, IDC_ZONE_GREYSCALE); + config->zones[config->cur_zone].chroma_opt = IsDlgButtonChecked(hDlg, IDC_ZONE_CHROMAOPT); - config->zones[config->cur_zone].bvop_threshold = config_get_int(hDlg, IDC_ZONE_BVOPTHRESHOLD, config->zones[config->cur_zone].bvop_threshold); - break; + config->zones[config->cur_zone].bvop_threshold = config_get_int(hDlg, IDC_ZONE_BVOPTHRESHOLD, config->zones[config->cur_zone].bvop_threshold); + break; case IDD_MOTION : config->motion_search = SendDlgItemMessage(hDlg, IDC_MOTION, CB_GETCURSEL, 0, 0); config->vhq_mode = SendDlgItemMessage(hDlg, IDC_VHQ, CB_GETCURSEL, 0, 0); config->chromame = IsDlgChecked(hDlg, IDC_CHROMAME); + config->cartoon_mode = IsDlgChecked(hDlg, IDC_CARTOON); + config->turbo = IsDlgChecked(hDlg, IDC_TURBO); - config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio); + config->frame_drop_ratio = config_get_uint(hDlg, IDC_FRAMEDROP, config->frame_drop_ratio); 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); break; case IDD_QUANT : @@ -1013,24 +1063,32 @@ CONSTRAINVAL(config->min_bquant, 1, 31); CONSTRAINVAL(config->max_bquant, config->min_bquant, 31); - config->trellis_quant = IsDlgChecked(hDlg, IDC_TRELLISQUANT); + config->trellis_quant = IsDlgChecked(hDlg, IDC_TRELLISQUANT); break; case IDD_DEBUG : config->cpu = 0; - config->cpu |= IsDlgChecked(hDlg, IDC_CPU_MMX) ? XVID_CPU_MMX : 0; + config->cpu |= IsDlgChecked(hDlg, IDC_CPU_MMX) ? XVID_CPU_MMX : 0; config->cpu |= IsDlgChecked(hDlg, IDC_CPU_MMXEXT) ? XVID_CPU_MMXEXT : 0; - config->cpu |= IsDlgChecked(hDlg, IDC_CPU_SSE) ? XVID_CPU_SSE : 0; - config->cpu |= IsDlgChecked(hDlg, IDC_CPU_SSE2) ? XVID_CPU_SSE2 : 0; - config->cpu |= IsDlgChecked(hDlg, IDC_CPU_3DNOW) ? XVID_CPU_3DNOW : 0; + config->cpu |= IsDlgChecked(hDlg, IDC_CPU_SSE) ? XVID_CPU_SSE : 0; + config->cpu |= IsDlgChecked(hDlg, IDC_CPU_SSE2) ? XVID_CPU_SSE2 : 0; + config->cpu |= IsDlgChecked(hDlg, IDC_CPU_3DNOW) ? XVID_CPU_3DNOW : 0; config->cpu |= IsDlgChecked(hDlg, IDC_CPU_3DNOWEXT) ? XVID_CPU_3DNOWEXT : 0; - config->cpu |= IsDlgChecked(hDlg, IDC_CPU_FORCE) ? XVID_CPU_FORCE : 0; + config->cpu |= IsDlgChecked(hDlg, IDC_CPU_FORCE) ? XVID_CPU_FORCE : 0; config->num_threads = config_get_uint(hDlg, IDC_NUMTHREADS, config->num_threads); - config->fourcc_used = SendDlgItemMessage(hDlg, IDC_FOURCC, CB_GETCURSEL, 0, 0); + config->fourcc_used = SendDlgItemMessage(hDlg, IDC_FOURCC, CB_GETCURSEL, 0, 0); + config->debug = get_dlgitem_hex(hDlg, IDC_DEBUG, config->debug); config->vop_debug = IsDlgChecked(hDlg, IDC_VOPDEBUG); - config->debug = get_dlgitem_hex(hDlg, IDC_DEBUG, config->debug); + config->display_status = IsDlgChecked(hDlg, IDC_DISPLAY_STATUS); + break; + + case IDD_DEC : + pp_dy = IsDlgChecked(hDlg, IDC_DEC_DY); + pp_duv = IsDlgChecked(hDlg, IDC_DEC_DUV); + pp_dr = IsDlgChecked(hDlg, IDC_DEC_DR); + pp_fe = IsDlgChecked(hDlg, IDC_DEC_FE); break; } } @@ -1054,7 +1112,7 @@ if (g_hTooltip) EnumChildWindows(hDlg, enum_tooltips, 0); - adv_init(hDlg, psi->idd, psi->config); + adv_init(hDlg, psi->idd, psi->config); break; case WM_COMMAND : @@ -1062,99 +1120,129 @@ { switch (LOWORD(wParam)) { - case IDC_BVOP : - case IDC_USEALT : - case IDC_USEAUTO : - case IDC_USEAUTOBONUS : - case IDC_ZONE_MODE_WEIGHT : - case IDC_ZONE_MODE_QUANT : - case IDC_ZONE_BVOPTHRESHOLD_ENABLE : + case IDC_BVOP : + case IDC_ZONE_MODE_WEIGHT : + case IDC_ZONE_MODE_QUANT : + case IDC_ZONE_BVOPTHRESHOLD_ENABLE : case IDC_CPU_AUTO : case IDC_CPU_FORCE : + case IDC_AR : + case IDC_PAR : + adv_mode(hDlg, psi->idd, psi->config); + break; + + case IDC_QUANTMATRIX : + DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_QUANTMATRIX), hDlg, quantmatrix_proc, (LPARAM)psi->config); + break; + + case IDC_STATS_BROWSE : + { + OPENFILENAME ofn; + char tmp[MAX_PATH]; + + GetDlgItemText(hDlg, IDC_STATS, tmp, MAX_PATH); + + memset(&ofn, 0, sizeof(OPENFILENAME)); + ofn.lStructSize = sizeof(OPENFILENAME); + + ofn.hwndOwner = hDlg; + ofn.lpstrFilter = "bitrate curve (*.stats)\0*.stats\0All files (*.*)\0*.*\0\0"; + ofn.lpstrFile = tmp; + ofn.nMaxFile = MAX_PATH; + ofn.Flags = OFN_PATHMUSTEXIST; + + if (psi->idd == IDD_RC_2PASS1) { + ofn.Flags |= OFN_OVERWRITEPROMPT; + }else{ + ofn.Flags |= OFN_FILEMUSTEXIST; + } + + if (GetSaveFileName(&ofn)) + { + SetDlgItemText(hDlg, IDC_STATS, tmp); + } + } + + case IDC_ZONE_FETCH : + SetDlgItemInt(hDlg, IDC_ZONE_FRAME, psi->config->ci.ciActiveFrame, FALSE); + break; + + case IDC_AR_DEFAULT: + CheckRadioButton(hDlg, IDC_AR, IDC_PAR, IDC_PAR); + SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_SETCURSEL, 0, 0); + adv_mode(hDlg, psi->idd, psi->config); + break; + case IDC_AR_4_3: + SetDlgItemInt(hDlg, IDC_ARX, 4, FALSE); + SetDlgItemInt(hDlg, IDC_ARY, 3, FALSE); + CheckRadioButton(hDlg, IDC_AR, IDC_PAR, IDC_AR); + adv_mode(hDlg, psi->idd, psi->config); + break; + case IDC_AR_16_9: + SetDlgItemInt(hDlg, IDC_ARX, 16, FALSE); + SetDlgItemInt(hDlg, IDC_ARY, 9, FALSE); + CheckRadioButton(hDlg, IDC_AR, IDC_PAR, IDC_AR); + adv_mode(hDlg, psi->idd, psi->config); + break; + case IDC_AR_235_100: + SetDlgItemInt(hDlg, IDC_ARX, 235, FALSE); + SetDlgItemInt(hDlg, IDC_ARY, 100, FALSE); + CheckRadioButton(hDlg, IDC_AR, IDC_PAR, IDC_AR); adv_mode(hDlg, psi->idd, psi->config); break; - case IDC_QUANTMATRIX : - DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_QUANTMATRIX), hDlg, quantmatrix_proc, (LPARAM)psi->config); - break; - - case IDC_STATS_BROWSE : - { - OPENFILENAME ofn; - char tmp[MAX_PATH]; - - GetDlgItemText(hDlg, IDC_STATS, tmp, MAX_PATH); - - memset(&ofn, 0, sizeof(OPENFILENAME)); - ofn.lStructSize = sizeof(OPENFILENAME); - - ofn.hwndOwner = hDlg; - ofn.lpstrFilter = "bitrate curve (*.stats)\0*.stats\0All files (*.*)\0*.*\0\0"; - ofn.lpstrFile = tmp; - ofn.nMaxFile = MAX_PATH; - ofn.Flags = OFN_PATHMUSTEXIST; - - if (psi->idd == IDD_RC_2PASS1) { - ofn.Flags |= OFN_OVERWRITEPROMPT; - }else{ - ofn.Flags |= OFN_FILEMUSTEXIST; - } - - if (GetSaveFileName(&ofn)) - { - SetDlgItemText(hDlg, IDC_STATS, tmp); - } - } - - case IDC_ZONE_FETCH : - SetDlgItemInt(hDlg, IDC_ZONE_FRAME, psi->config->ci.ciActiveFrame, FALSE); - break; - - default : - return TRUE; - } + default : + return TRUE; + } }else if (HIWORD(wParam) == LBN_SELCHANGE && - (LOWORD(wParam) == IDC_PROFILE_PROFILE || - LOWORD(wParam) == IDC_LEVEL_PROFILE || - LOWORD(wParam) == IDC_QUANTTYPE)) + (LOWORD(wParam) == IDC_PROFILE_PROFILE || + LOWORD(wParam) == IDC_LEVEL_PROFILE || + LOWORD(wParam) == IDC_QUANTTYPE || + LOWORD(wParam) == IDC_ASPECT_RATIO)) { - adv_mode(hDlg, psi->idd, psi->config); - }else if (HIWORD(wParam) == EN_UPDATE && (LOWORD(wParam)==IDC_ZONE_WEIGHT || LOWORD(wParam)==IDC_ZONE_QUANT)) { + adv_mode(hDlg, psi->idd, psi->config); + }else if (HIWORD(wParam) == EN_UPDATE && (LOWORD(wParam)==IDC_ZONE_WEIGHT || LOWORD(wParam)==IDC_ZONE_QUANT)) { - SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETPOS, TRUE, - get_dlgitem_float(hDlg, LOWORD(wParam), 100)); - }else { - return 0; - } + SendDlgItemMessage(hDlg, IDC_ZONE_SLIDER, TBM_SETPOS, TRUE, + get_dlgitem_float(hDlg, LOWORD(wParam), 100)); + } else if (HIWORD(wParam) == EN_UPDATE && (LOWORD(wParam)==IDC_PARX || LOWORD(wParam)==IDC_PARY)) { + if (5 == SendDlgItemMessage(hDlg, IDC_ASPECT_RATIO, CB_GETCURSEL, 0, 0)) { + if(LOWORD(wParam)==IDC_PARX) + psi->config->par_x = config_get_uint(hDlg, LOWORD(wParam), psi->config->par_x); + else + psi->config->par_y = config_get_uint(hDlg, LOWORD(wParam), psi->config->par_y); + } + } else + return 0; break; case WM_HSCROLL : if((HWND)lParam == GetDlgItem(hDlg, IDC_ZONE_SLIDER)) { - int idc = IsDlgChecked(hDlg, IDC_ZONE_MODE_WEIGHT) ? IDC_ZONE_WEIGHT : IDC_ZONE_QUANT; - set_dlgitem_float(hDlg, idc, SendMessage((HWND)lParam, TBM_GETPOS, 0, 0) ); - break; - } - return 0; + int idc = IsDlgChecked(hDlg, IDC_ZONE_MODE_WEIGHT) ? IDC_ZONE_WEIGHT : IDC_ZONE_QUANT; + set_dlgitem_float(hDlg, idc, SendMessage((HWND)lParam, TBM_GETPOS, 0, 0) ); + break; + } + return 0; - + case WM_NOTIFY : switch (((NMHDR *)lParam)->code) { - case PSN_SETACTIVE : - OutputDebugString("PSN_SET"); - adv_upload(hDlg, psi->idd, psi->config); - adv_mode(hDlg, psi->idd, psi->config); - SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); - break; - - case PSN_KILLACTIVE : - OutputDebugString("PSN_KILL"); - adv_download(hDlg, psi->idd, psi->config); + case PSN_SETACTIVE : + OutputDebugString("PSN_SET"); + adv_upload(hDlg, psi->idd, psi->config); + adv_mode(hDlg, psi->idd, psi->config); + SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); + break; + + case PSN_KILLACTIVE : + OutputDebugString("PSN_KILL"); + adv_download(hDlg, psi->idd, psi->config); SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); break; case PSN_APPLY : - OutputDebugString("PSN_APPLY"); + OutputDebugString("PSN_APPLY"); psi->config->save = TRUE; SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); break; @@ -1171,7 +1259,7 @@ -/* load advanced options property sheet +/* load advanced options property sheet returns true, if the user accepted the changes or fasle if changes were canceled. @@ -1212,10 +1300,10 @@ psh.pfnCallback = NULL; PropertySheet(&psh); - if (temp.save) + if (temp.save) memcpy(config, &temp, sizeof(CONFIG)); - return temp.save; + return temp.save; } /* ===================================================================================== */ @@ -1225,116 +1313,135 @@ void main_insert_zone(HWND hDlg, zone_t * s, int i, BOOL insert) { - char tmp[32]; + char tmp[32]; + + wsprintf(tmp,"%i",s->frame); - wsprintf(tmp,"%i",s->frame); + if (insert) { + LVITEM lvi; + + lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM | LVIF_STATE; + lvi.state = 0; + lvi.stateMask = 0; + lvi.iImage = 0; + lvi.pszText = tmp; + lvi.cchTextMax = strlen(tmp); + lvi.iItem = i; + lvi.iSubItem = 0; + ListView_InsertItem(hDlg, &lvi); + }else{ + ListView_SetItemText(hDlg, i, 0, tmp); + } + + if (s->mode == RC_ZONE_WEIGHT) { + sprintf(tmp,"W %.2f",(float)s->weight/100); + }else if (s->mode == RC_ZONE_QUANT) { + sprintf(tmp,"Q %.2f",(float)s->quant/100); + }else { + strcpy(tmp,"EXT"); + } + ListView_SetItemText(hDlg, i, 1, tmp); - if (insert) { - LVITEM lvi; + tmp[0] = '\0'; + if (s->type==XVID_TYPE_IVOP) + strcat(tmp, "K "); - lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM | LVIF_STATE; - lvi.state = 0; - lvi.stateMask = 0; - lvi.iImage = 0; - lvi.pszText = tmp; - lvi.cchTextMax = strlen(tmp); - lvi.iItem = i; - lvi.iSubItem = 0; - ListView_InsertItem(hDlg, &lvi); - }else{ - ListView_SetItemText(hDlg, i, 0, tmp); - } - - if (s->mode == RC_ZONE_WEIGHT) { - sprintf(tmp,"%.2f",(float)s->weight/100); - }else if (s->mode == RC_ZONE_QUANT) { - sprintf(tmp,"( %.2f )",(float)s->quant/100); - }else { - strcpy(tmp,"EXT"); - } - ListView_SetItemText(hDlg, i, 1, tmp); - - tmp[0] = '\0'; - if (s->greyscale) - strcat(tmp, "G "); - - if (s->chroma_opt) - strcat(tmp, "C "); + if (s->greyscale) + strcat(tmp, "G "); - ListView_SetItemText(hDlg, i, 2, tmp); + if (s->chroma_opt) + strcat(tmp, "C "); + + ListView_SetItemText(hDlg, i, 2, tmp); } +static int g_use_bitrate = 1; void main_mode(HWND hDlg, CONFIG * config) { - char buf[16]; - int profile = SendDlgItemMessage(hDlg, IDC_PROFILE, CB_GETCURSEL, 0, 0); - int bitrate_en; - int max; - - wsprintf(buf, "%i kbps", DEFAULT_MIN_KBPS); - SetDlgItemText(hDlg, IDC_BITRATE_MIN, buf); - - max = profiles[profile].max_bitrate; - if (max == 0) max = DEFAULT_MAX_KBPS; - wsprintf(buf, "%i kbps", max); - SetDlgItemText(hDlg, IDC_BITRATE_MAX, buf); - - SendDlgItemMessage(hDlg, IDC_SLIDER, TBM_SETRANGE, TRUE, MAKELONG(DEFAULT_MIN_KBPS, max)); - SendDlgItemMessage(hDlg, IDC_SLIDER, TBM_SETPOS, TRUE, - config_get_uint(hDlg, IDC_BITRATE, DEFAULT_MIN_KBPS) ); - - bitrate_en = SendDlgItemMessage(hDlg, IDC_MODE, CB_GETCURSEL, 0, 0); - bitrate_en = bitrate_en==RC_MODE_1PASS || bitrate_en==RC_MODE_2PASS2; - - EnableDlgWindow(hDlg, IDC_BITRATE_S, bitrate_en); - EnableDlgWindow(hDlg, IDC_BITRATE, bitrate_en); - EnableDlgWindow(hDlg, IDC_BITRATE_MIN, bitrate_en); - EnableDlgWindow(hDlg, IDC_BITRATE_MAX, bitrate_en); - EnableDlgWindow(hDlg, IDC_SLIDER, bitrate_en); + const int profile = SendDlgItemMessage(hDlg, IDC_PROFILE, CB_GETCURSEL, 0, 0); + const int rc_mode = SendDlgItemMessage(hDlg, IDC_MODE, CB_GETCURSEL, 0, 0); + /* enable target rate/size control only for 1pass and 2pass modes*/ + const int target_en = rc_mode==RC_MODE_1PASS || rc_mode==RC_MODE_2PASS2; + + char buf[16]; + int max; + + g_use_bitrate = rc_mode==RC_MODE_1PASS || config->use_2pass_bitrate; + + if (g_use_bitrate) { + SetDlgItemText(hDlg, IDC_BITRATE_S, "Target bitrate (kbps):"); + + wsprintf(buf, "%i kbps", DEFAULT_MIN_KBPS); + SetDlgItemText(hDlg, IDC_BITRATE_MIN, buf); + + max = profiles[profile].max_bitrate; + if (max == 0) max = DEFAULT_MAX_KBPS; + wsprintf(buf, "%i kbps", max); + SetDlgItemText(hDlg, IDC_BITRATE_MAX, buf); + + SendDlgItemMessage(hDlg, IDC_SLIDER, TBM_SETRANGE, TRUE, MAKELONG(DEFAULT_MIN_KBPS, max)); + SendDlgItemMessage(hDlg, IDC_SLIDER, TBM_SETPOS, TRUE, + config_get_uint(hDlg, IDC_BITRATE, DEFAULT_MIN_KBPS) ); + + }else{ + SetDlgItemText(hDlg, IDC_BITRATE_S, "Target size (kbytes):"); + } + + EnableDlgWindow(hDlg, IDC_BITRATE_S, target_en); + EnableDlgWindow(hDlg, IDC_BITRATE, target_en); + + EnableDlgWindow(hDlg, IDC_BITRATE_MIN, target_en && g_use_bitrate); + EnableDlgWindow(hDlg, IDC_BITRATE_MAX, target_en && g_use_bitrate); + EnableDlgWindow(hDlg, IDC_SLIDER, target_en && g_use_bitrate); } + + void main_upload(HWND hDlg, CONFIG * config) { - int i; - SendDlgItemMessage(hDlg, IDC_PROFILE, CB_SETCURSEL, config->profile, 0); - SendDlgItemMessage(hDlg, IDC_MODE, CB_SETCURSEL, config->mode, 0); - SetDlgItemInt(hDlg, IDC_BITRATE, config->bitrate, FALSE); - - ListView_DeleteAllItems(GetDlgItem(hDlg,IDC_ZONES)); - for (i=0; i < config->num_zones; i++) { - main_insert_zone(GetDlgItem(hDlg,IDC_ZONES), &config->zones[i], i, TRUE); - } -} + SendDlgItemMessage(hDlg, IDC_PROFILE, CB_SETCURSEL, config->profile, 0); + SendDlgItemMessage(hDlg, IDC_MODE, CB_SETCURSEL, config->mode, 0); + + if (g_use_bitrate) { + SetDlgItemInt(hDlg, IDC_BITRATE, config->bitrate, FALSE); + }else{ + SetDlgItemInt(hDlg, IDC_BITRATE, config->desired_size, FALSE); + } + + zones_update(hDlg, config);} /* downloads data from main dialog */ void main_download(HWND hDlg, CONFIG * config) { - config->profile = SendDlgItemMessage(hDlg, IDC_PROFILE, CB_GETCURSEL, 0, 0); + config->profile = SendDlgItemMessage(hDlg, IDC_PROFILE, CB_GETCURSEL, 0, 0); config->mode = SendDlgItemMessage(hDlg, IDC_MODE, CB_GETCURSEL, 0, 0); - config->bitrate = config_get_uint(hDlg, IDC_BITRATE, config->bitrate); -} - + if (g_use_bitrate) { + config->bitrate = config_get_uint(hDlg, IDC_BITRATE, config->bitrate); + }else{ + config->desired_size = config_get_uint(hDlg, IDC_BITRATE, config->desired_size); + } +} /* main dialog proc */ -static const int profile_dlgs[] = { IDD_PROFILE, IDD_LEVEL }; +static const int profile_dlgs[] = { IDD_PROFILE, IDD_LEVEL, IDD_AR }; static const int single_dlgs[] = { IDD_RC_CBR }; static const int pass1_dlgs[] = { IDD_RC_2PASS1 }; -static const int pass2_dlgs[] = { IDD_RC_2PASS2, IDD_RC_2PASS2_ALT}; +static const int pass2_dlgs[] = { IDD_RC_2PASS2 }; static const int zone_dlgs[] = { IDD_ZONE }; -static const int bitrate_dlgs[] = { IDD_CALC }; +static const int decoder_dlgs[] = { IDD_DEC }; static const int adv_dlgs[] = { IDD_MOTION, IDD_QUANT, IDD_DEBUG}; BOOL CALLBACK main_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CONFIG* config = (CONFIG*)GetWindowLong(hDlg, GWL_USERDATA); - unsigned int i; + CONFIG* config = (CONFIG*)GetWindowLong(hDlg, GWL_USERDATA); + unsigned int i; switch (uMsg) { @@ -1345,16 +1452,15 @@ for (i=0; icode == NM_DBLCLK) { - NMLISTVIEW * nmlv = (NMLISTVIEW*) lParam; - config->cur_zone = nmlv->iItem; - - main_download(hDlg, config); - if (config->cur_zone >= 0 && adv_dialog(hDlg, config, zone_dlgs, sizeof(zone_dlgs)/sizeof(int))) { - main_insert_zone(GetDlgItem(hDlg, IDC_ZONES), &config->zones[config->cur_zone], config->cur_zone, FALSE); - } - break; - } - - if (n->code == NM_RCLICK) { - OutputDebugString("Right click"); - } - break; - } + { + DWORD ext_style = ListView_GetExtendedListViewStyle(GetDlgItem(hDlg,IDC_ZONES)); + ext_style |= LVS_EX_FULLROWSELECT | LVS_EX_FLATSB ; + ListView_SetExtendedListViewStyle(GetDlgItem(hDlg,IDC_ZONES), ext_style); + } + + { + typedef struct { + char * name; + int value; + } char_int_t; + + const static char_int_t columns[] = { + {"Frame #", 64}, + {"Weight/Quant", 82}, + {"Modifiers", 120}}; + + LVCOLUMN lvc; + int i; + + /* Initialize the LVCOLUMN structure. */ + lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM; + lvc.fmt = LVCFMT_LEFT; + + /* Add the columns. */ + for (i=0; icode == NM_DBLCLK) { + NMLISTVIEW * nmlv = (NMLISTVIEW*) lParam; + config->cur_zone = nmlv->iItem; + + main_download(hDlg, config); + if (config->cur_zone >= 0 && adv_dialog(hDlg, config, zone_dlgs, sizeof(zone_dlgs)/sizeof(int))) { + zones_update(hDlg, config); + } + break; + } + + if (n->code == NM_RCLICK) { + OutputDebugString("Right click"); + } + break; + } case WM_COMMAND : - if (HIWORD(wParam) == BN_CLICKED) { + if (HIWORD(wParam) == BN_CLICKED) { + + switch(LOWORD(wParam)) { + case IDC_PROFILE_ADV : + main_download(hDlg, config); + adv_dialog(hDlg, config, profile_dlgs, sizeof(profile_dlgs)/sizeof(int)); - switch(LOWORD(wParam)) { - case IDC_PROFILE_ADV : - main_download(hDlg, config); - adv_dialog(hDlg, config, profile_dlgs, sizeof(profile_dlgs)/sizeof(int)); - - SendDlgItemMessage(hDlg, IDC_PROFILE, CB_SETCURSEL, config->profile, 0); - main_mode(hDlg, config); - break; - - case IDC_MODE_ADV : - main_download(hDlg, config); - if (config->mode == RC_MODE_1PASS) { - adv_dialog(hDlg, config, single_dlgs, sizeof(single_dlgs)/sizeof(int)); - }else if (config->mode == RC_MODE_2PASS1) { - adv_dialog(hDlg, config, pass1_dlgs, sizeof(pass1_dlgs)/sizeof(int)); - }else if (config->mode == RC_MODE_2PASS2) { - adv_dialog(hDlg, config, pass2_dlgs, sizeof(pass2_dlgs)/sizeof(int)); - } - break; - - case IDC_BITRATE_CALC : - main_download(hDlg, config); - adv_dialog(hDlg, config, bitrate_dlgs, sizeof(bitrate_dlgs)/sizeof(int)); - SetDlgItemInt(hDlg, IDC_BITRATE, config->bitrate, FALSE); - main_mode(hDlg, config); - break; - - case IDC_ADD : - { - int i, sel, new_frame; - - if (config->num_zones >= MAX_ZONES) { - MessageBox(hDlg, "MAX_ZONES", "Warning", 0); - break; - } - - sel = ListView_GetNextItem(GetDlgItem(hDlg, IDC_ZONES), -1, LVNI_SELECTED); - - if (sel<0) { - if (config->ci_valid && config->ci.ciActiveFrame>0) { - for(sel=0; selnum_zones-1 && config->zones[sel].frameci.ciActiveFrame; sel++) ; - sel--; - new_frame = config->ci.ciActiveFrame; - }else{ - sel = config->num_zones-1; - new_frame = config->zones[sel].frame + 1; - } - }else{ - new_frame = config->zones[sel].frame + 1; - } - - if (sel+1num_zones && config->zones[sel+1].frame==new_frame) { - MessageBox(hDlg, "CANT ADD HERE", "Warning", 0); - break; - } - - for(i=config->num_zones-1; i>sel; i--) { - config->zones[i+1] = config->zones[i]; - } - config->num_zones++; - config->zones[sel+1].frame = new_frame; - config->zones[sel+1].mode = RC_ZONE_WEIGHT; - config->zones[sel+1].weight = 100; - config->zones[sel+1].quant = 500; - config->zones[sel+1].greyscale = 0; - config->zones[sel+1].chroma_opt = 0; - config->zones[sel+1].bvop_threshold = 0; - - ListView_SetItemState(GetDlgItem(hDlg, IDC_ZONES), sel, 0x00000000, LVIS_SELECTED); - main_insert_zone(GetDlgItem(hDlg, IDC_ZONES), &config->zones[sel+1], sel+1, TRUE); - ListView_SetItemState(GetDlgItem(hDlg, IDC_ZONES), sel+1, 0xffffffff, LVIS_SELECTED); - break; - } - - case IDC_REMOVE : - { - int i, sel; - sel = ListView_GetNextItem(GetDlgItem(hDlg, IDC_ZONES), -1, LVNI_SELECTED); - - if (sel == -1) { - MessageBox(hDlg, "Nothing selected", "Warning", 0); - break; - } - - if (sel == 0) { - MessageBox(hDlg, "Can't remove first zone", "Warning", 0); - break; - } - - for (i=sel; inum_zones-1; i++) { - config->zones[i] = config->zones[i+1]; - } - config->num_zones--; - ListView_DeleteItem(GetDlgItem(hDlg, IDC_ZONES), sel); - - - sel--; - if (sel==0 && config->num_zones>1) { - sel=1; - } - ListView_SetItemState(GetDlgItem(hDlg, IDC_ZONES), sel, 0xffffffff, LVIS_SELECTED); - break; - } - - case IDC_EDIT : - main_download(hDlg, config); - config->cur_zone = ListView_GetNextItem(GetDlgItem(hDlg, IDC_ZONES), -1, LVNI_SELECTED); - if (config->cur_zone != -1 && adv_dialog(hDlg, config, zone_dlgs, sizeof(zone_dlgs)/sizeof(int))) { - main_insert_zone(GetDlgItem(hDlg, IDC_ZONES), &config->zones[config->cur_zone], config->cur_zone, FALSE); - } - break; - - case IDC_ADVANCED : - main_download(hDlg, config); - adv_dialog(hDlg, config, adv_dlgs, sizeof(adv_dlgs)/sizeof(int)); - break; - - case IDC_DEFAULTS : - config_reg_default(config); - main_upload(hDlg, config); - break; - - case IDOK : - main_download(hDlg, config); - config->save = TRUE; - EndDialog(hDlg, IDOK); - break; - - case IDCANCEL : - config->save = FALSE; - EndDialog(hDlg, IDCANCEL); - break; - } - }else if (HIWORD(wParam) == LBN_SELCHANGE && - (LOWORD(wParam)==IDC_PROFILE || LOWORD(wParam)==IDC_MODE)) { - main_mode(hDlg, config); - }else if (HIWORD(wParam)==EN_UPDATE && LOWORD(wParam)==IDC_BITRATE) { - - SendDlgItemMessage(hDlg, IDC_SLIDER, TBM_SETPOS, TRUE, - config_get_uint(hDlg, IDC_BITRATE, DEFAULT_MIN_KBPS) ); - }else { - return 0; - } + SendDlgItemMessage(hDlg, IDC_PROFILE, CB_SETCURSEL, config->profile, 0); + main_mode(hDlg, config); + break; + + case IDC_MODE_ADV : + main_download(hDlg, config); + if (config->mode == RC_MODE_1PASS) { + adv_dialog(hDlg, config, single_dlgs, sizeof(single_dlgs)/sizeof(int)); + }else if (config->mode == RC_MODE_2PASS1) { + adv_dialog(hDlg, config, pass1_dlgs, sizeof(pass1_dlgs)/sizeof(int)); + }else if (config->mode == RC_MODE_2PASS2) { + adv_dialog(hDlg, config, pass2_dlgs, sizeof(pass2_dlgs)/sizeof(int)); + } + break; + + + case IDC_BITRATE_S : + /* alternate between bitrate/desired_length metrics */ + main_download(hDlg, config); + config->use_2pass_bitrate = !config->use_2pass_bitrate; + main_mode(hDlg, config); + main_upload(hDlg, config); + break; + + case IDC_DECODER : + main_download(hDlg, config); + adv_dialog(hDlg, config, decoder_dlgs, sizeof(decoder_dlgs)/sizeof(int)); + main_mode(hDlg, config); + break; + + case IDC_ADD : + { + int i, sel, new_frame; + + if (config->num_zones >= MAX_ZONES) { + MessageBox(hDlg, "Exceeded maximum number of zones.\nIncrease config.h:MAX_ZONES and rebuild.", "Warning", 0); + break; + } + + sel = ListView_GetNextItem(GetDlgItem(hDlg, IDC_ZONES), -1, LVNI_SELECTED); + + if (sel<0) { + if (config->ci_valid && config->ci.ciActiveFrame>0) { + for(sel=0; selnum_zones-1 && config->zones[sel].frameci.ciActiveFrame; sel++) ; + sel--; + new_frame = config->ci.ciActiveFrame; + }else{ + sel = config->num_zones-1; + new_frame = sel<0 ? 0 : config->zones[sel].frame + 1; + } + }else{ + new_frame = config->zones[sel].frame + 1; + } + + for(i=config->num_zones-1; i>sel; i--) { + config->zones[i+1] = config->zones[i]; + } + config->num_zones++; + config->zones[sel+1].frame = new_frame; + config->zones[sel+1].mode = RC_ZONE_WEIGHT; + config->zones[sel+1].weight = 100; + config->zones[sel+1].quant = 500; + config->zones[sel+1].type = XVID_TYPE_AUTO; + config->zones[sel+1].greyscale = 0; + config->zones[sel+1].chroma_opt = 0; + config->zones[sel+1].bvop_threshold = 0; + + ListView_SetItemState(GetDlgItem(hDlg, IDC_ZONES), sel, 0x00000000, LVIS_SELECTED); + zones_update(hDlg, config); + ListView_SetItemState(GetDlgItem(hDlg, IDC_ZONES), sel+1, 0xffffffff, LVIS_SELECTED); + break; + } + + case IDC_REMOVE : + { + int i, sel; + sel = ListView_GetNextItem(GetDlgItem(hDlg, IDC_ZONES), -1, LVNI_SELECTED); + + if (sel == -1 || config->num_zones < 1) { + /*MessageBox(hDlg, "Nothing selected", "Warning", 0);*/ + break; + } + + for (i=sel; inum_zones-1; i++) + config->zones[i] = config->zones[i+1]; + + config->num_zones--; + + zones_update(hDlg, config); + break; + } + + case IDC_EDIT : + main_download(hDlg, config); + config->cur_zone = ListView_GetNextItem(GetDlgItem(hDlg, IDC_ZONES), -1, LVNI_SELECTED); + if (config->cur_zone != -1 && adv_dialog(hDlg, config, zone_dlgs, sizeof(zone_dlgs)/sizeof(int))) { + zones_update(hDlg, config); + } + break; + + case IDC_ADVANCED : + main_download(hDlg, config); + adv_dialog(hDlg, config, adv_dlgs, sizeof(adv_dlgs)/sizeof(int)); + break; + + case IDC_DEFAULTS : + config_reg_default(config); + main_upload(hDlg, config); + break; + + case IDOK : + main_download(hDlg, config); + config->save = TRUE; + EndDialog(hDlg, IDOK); + break; + + case IDCANCEL : + config->save = FALSE; + EndDialog(hDlg, IDCANCEL); + break; + } + }else if (HIWORD(wParam) == LBN_SELCHANGE && + (LOWORD(wParam)==IDC_PROFILE || LOWORD(wParam)==IDC_MODE)) { + + main_download(hDlg, config); + main_mode(hDlg, config); + main_upload(hDlg, config); + + }else if (HIWORD(wParam)==EN_UPDATE && LOWORD(wParam)==IDC_BITRATE) { + + if (g_use_bitrate) { + SendDlgItemMessage(hDlg, IDC_SLIDER, TBM_SETPOS, TRUE, + config_get_uint(hDlg, IDC_BITRATE, DEFAULT_MIN_KBPS) ); + } + + }else { + return 0; + } break; case WM_HSCROLL : if((HWND)lParam == GetDlgItem(hDlg, IDC_SLIDER)) { - SetDlgItemInt(hDlg, IDC_BITRATE, SendMessage((HWND)lParam, TBM_GETPOS, 0, 0), FALSE); - break; - } - return 0; + SetDlgItemInt(hDlg, IDC_BITRATE, SendMessage((HWND)lParam, TBM_GETPOS, 0, 0), FALSE); + break; + } + return 0; default : return 0; @@ -1604,18 +1713,30 @@ char core[100]; HFONT hFont; LOGFONT lfData; + HINSTANCE m_hdll; SetDlgItemText(hDlg, IDC_BUILD, XVID_BUILD); SetDlgItemText(hDlg, IDC_SPECIAL_BUILD, XVID_SPECIAL_BUILD); memset(&info, 0, sizeof(info)); info.version = XVID_VERSION; - xvid_global(0, XVID_GBL_INFO, &info, NULL); - wsprintf(core, "libxvidcore version %d.%d.%d (\"%s\")", - XVID_MAJOR(info.actual_version), - XVID_MINOR(info.actual_version), - XVID_PATCH(info.actual_version), - info.build); + + m_hdll = LoadLibrary(XVID_DLL_NAME); + if (m_hdll != NULL) { + + ((int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_global")) + (0, XVID_GBL_INFO, &info, NULL); + + wsprintf(core, "xvidcore.dll version %d.%d.%d (\"%s\")", + XVID_VERSION_MAJOR(info.actual_version), + XVID_VERSION_MINOR(info.actual_version), + XVID_VERSION_PATCH(info.actual_version), + info.build); + + FreeLibrary(m_hdll); + } else { + wsprintf(core, "xvidcore.dll not found!"); + } SetDlgItemText(hDlg, IDC_CORE, core); @@ -1634,18 +1755,17 @@ SetDlgItemText(hDlg, IDC_WEBSITE, XVID_WEBSITE); } break; - case WM_CTLCOLORSTATIC : if ((HWND)lParam == GetDlgItem(hDlg, IDC_WEBSITE)) { - SetBkMode((HDC)wParam, TRANSPARENT) ; + SetBkMode((HDC)wParam, TRANSPARENT) ; SetTextColor((HDC)wParam, RGB(0x00,0x00,0xc0)); - return (BOOL)GetStockObject(NULL_BRUSH); + return (BOOL)GetStockObject(NULL_BRUSH); } return 0; case WM_COMMAND : - if (LOWORD(wParam) == IDC_WEBSITE && HIWORD(wParam) == STN_CLICKED) + if (LOWORD(wParam) == IDC_WEBSITE && HIWORD(wParam) == STN_CLICKED) { ShellExecute(hDlg, "open", XVID_WEBSITE, NULL, NULL, SW_SHOWNORMAL); } @@ -1661,3 +1781,49 @@ return 1; } + +static void +sort_zones(zone_t * zones, int zone_num, int * sel) +{ + int i, j; + zone_t tmp; + for (i = 0; i < zone_num; i++) { + int cur = i; + int min_f = zones[i].frame; + for (j = i + 1; j < zone_num; j++) { + if (zones[j].frame < min_f) { + min_f = zones[j].frame; + cur = j; + } + } + if (cur != i) { + tmp = zones[i]; + zones[i] = zones[cur]; + zones[cur] = tmp; + if (i == *sel) *sel = cur; + else if (cur == *sel) *sel = i; + } + } +} + + +static void +zones_update(HWND hDlg, CONFIG * config) +{ + int i, sel; + + sel = ListView_GetNextItem(GetDlgItem(hDlg, IDC_ZONES), -1, LVNI_SELECTED); + + sort_zones(config->zones, config->num_zones, &sel); + + ListView_DeleteAllItems(GetDlgItem(hDlg,IDC_ZONES)); + + for (i = 0; i < config->num_zones; i++) + main_insert_zone(GetDlgItem(hDlg,IDC_ZONES), &config->zones[i], i, TRUE); + + if (sel == -1 && config->num_zones > 0) sel = 0; + if (sel >= config->num_zones) sel = config->num_zones-1; + + config->cur_zone = sel; + ListView_SetItemState(GetDlgItem(hDlg, IDC_ZONES), sel, 0xffffffff, LVIS_SELECTED); +} \ No newline at end of file