--- config.h 2002/04/15 08:03:19 1.6 +++ config.h 2003/02/12 13:31:24 1.14.2.5 @@ -23,7 +23,8 @@ #define XVID_REG_CLASS "config" #define XVID_BUILD __TIME__ ", " __DATE__ -#define XVID_WEBSITE "http://www.xvid.org" +#define XVID_WEBSITE "http://www.xvid.org/" +#define XVID_SPECIAL_BUILD "(Vanilla CVS Build)" /* constants */ #define CONFIG_HINTFILE "\\hintfile.mvh" @@ -54,12 +55,20 @@ #define QUANT_MODE_MPEG 1 #define QUANT_MODE_CUSTOM 2 #define QUANT_MODE_MOD 3 +#define QUANT_MODE_MOD_NEW 4 /* credits modes */ #define CREDITS_MODE_RATE 0 #define CREDITS_MODE_QUANT 1 #define CREDITS_MODE_SIZE 2 +/* vhq modes */ +#define VHQ_OFF 0 +#define VHQ_MODE_DECISION 1 +#define VHQ_LIMITED_SEARCH 2 +#define VHQ_MEDIUM_SEARCH 3 +#define VHQ_WIDE_SEARCH 4 + #define CREDITS_START 1 #define CREDITS_END 2 @@ -68,10 +77,15 @@ typedef struct { - int mode; +/********** ATTENTION **********/ + int mode; // Vidomi directly accesses these vars + int rc_bitrate; // + int desired_size; // please try to avoid modifications here + char stats1[MAX_PATH]; // +/*******************************/ + int quality; int quant; - int rc_bitrate; int rc_reaction_delay_factor; int rc_averaging_period; int rc_buffer; @@ -79,10 +93,24 @@ int motion_search; int quant_type; int fourcc_used; + int vhq_mode; int max_key_interval; int min_key_interval; int lum_masking; int interlacing; + int qpel; + int gmc; + int chromame; +//added by koepi for gruel's greyscale_mode + int greyscale; +// end of koepi's additions + int max_bframes; + int bquant_ratio; + int bquant_offset; + int packed; + int dx50bvop; + int debug; + int reduced_resolution; int min_iquant; int max_iquant; @@ -91,8 +119,11 @@ BYTE qmatrix_intra[64]; BYTE qmatrix_inter[64]; - int desired_size; int keyframe_boost; +//added by koepi for new 2pass curve treatment + int kftreshold; + int kfreduction; +// end of koepi's additions int discard1pass; int dummy2pass; int curve_compression_high; @@ -113,7 +144,6 @@ int bitrate_payback_method; int hinted_me; char hintfile[MAX_PATH]; - char stats1[MAX_PATH]; char stats2[MAX_PATH]; int credits_start; @@ -123,6 +153,9 @@ int credits_end_begin; int credits_end_end; +//added by koepi for gruel's greyscale_mode + int credits_greyscale; +// end of koepi's additions int credits_mode; int credits_rate; int credits_quant_i; @@ -130,6 +163,16 @@ int credits_start_size; int credits_end_size; +#ifdef _SMP + int num_threads; +#endif + int frame_drop_ratio; + + /* decoder */ + + int deblock_y; + int deblock_uv; + // char build[50]; DWORD cpu; float fquant; @@ -159,7 +202,8 @@ void config_reg_get(CONFIG *); void config_reg_set(CONFIG *); void config_reg_default(CONFIG *); -int config_get_int(HWND, UINT, int); +int config_get_int(HWND, INT, int); +int config_get_uint(HWND, UINT, int); void main_download(HWND, CONFIG *); void main_slider(HWND, CONFIG *); void main_value(HWND, CONFIG *);