--- trunk/vfw/src/config.h 2002/03/23 06:58:56 61 +++ branches/dev-api-3/vfw/src/config.h 2002/11/19 13:23:17 660 @@ -23,9 +23,11 @@ #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" #define CONFIG_2PASS_1_FILE "\\video.stats" #define CONFIG_2PASS_2_FILE "\\videogk.stats" @@ -53,6 +55,7 @@ #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 @@ -67,17 +70,40 @@ typedef struct { - int mode; - int bitrate; +/********** 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_buffersize; + int rc_reaction_delay_factor; + int rc_averaging_period; + int rc_buffer; int motion_search; int quant_type; int fourcc_used; 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 +#ifdef BFRAMES + int max_bframes; + int bquant_ratio; + int bquant_offset; + int packed; + int dx50bvop; + int debug; +#endif int min_iquant; int max_iquant; @@ -86,9 +112,11 @@ BYTE qmatrix_intra[64]; BYTE qmatrix_inter[64]; - int desired_size; int keyframe_boost; - int min_key_interval; +//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; @@ -102,9 +130,13 @@ int alt_curve_high_dist; int alt_curve_low_dist; int alt_curve_min_rel_qual; + int twopass_max_bitrate; + int twopass_max_overflow_improvement; + int twopass_max_overflow_degradation; int bitrate_payback_delay; int bitrate_payback_method; - char stats1[MAX_PATH]; + int hinted_me; + char hintfile[MAX_PATH]; char stats2[MAX_PATH]; int credits_start; @@ -114,6 +146,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; @@ -121,6 +156,13 @@ int credits_start_size; int credits_end_size; +#ifdef _SMP + int num_threads; +#endif +#ifdef BFRAMES + int frame_drop_ratio; +#endif + // char build[50]; DWORD cpu; float fquant; @@ -150,7 +192,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 *);