--- branches/dev-api-4/xvidcore/vfw/src/config.h	2003/05/13 12:48:20	1016
+++ branches/dev-api-4/xvidcore/vfw/src/config.h	2003/05/14 11:44:29	1017
@@ -2,6 +2,7 @@
 #define _CONFIG_H_
 
 #include <windows.h>
+#include "vfwext.h"
 
 extern HINSTANCE g_hInst;
 
@@ -14,6 +15,11 @@
 /* one kilobit */
 #define CONFIG_KBPS 1000
 
+/* min/max bitrate when not specified by profile */
+#define DEFAULT_MIN_KBPS    16
+#define DEFAULT_MAX_KBPS    10000
+
+
 /* registry stuff */
 #define XVID_REG_KEY	HKEY_CURRENT_USER
 #define XVID_REG_PARENT	"Software\\GNU"
@@ -28,13 +34,13 @@
 #define CONFIG_2PASS_FILE "\\video.pass"
 
 /* codec modes */
-#define RC_MODE_CBR				0
-#define RC_MODE_VBR_QUAL		1	/* deprecated */
-#define RC_MODE_FIXED			2
-#define RC_MODE_2PASS1			3
-#define RC_MODE_2PASS2_EXT		4
-#define RC_MODE_2PASS2_INT		5
-#define RC_MODE_NULL			6
+#define RC_MODE_1PASS          0
+#define RC_MODE_2PASS1         1
+#define RC_MODE_2PASS2         2
+#define RC_MODE_NULL           3
+
+#define RC_ZONE_WEIGHT         0
+#define RC_ZONE_QUANT          1
 
 /* vhq modes */
 #define VHQ_OFF					0
@@ -49,53 +55,60 @@
 #define QUANT_MODE_CUSTOM		2
 
 
+#define MAX_ZONES    64
+typedef struct
+{
+    int frame;
+    
+    int mode;
+    int weight;
+    int quant;
+    /* overrides: when ==MODIFIER_USE_DEFAULT use default/global setting */
+    unsigned int greyscale;
+    unsigned int chroma_opt;
+    unsigned int bvop_threshold;
+} zone_t;
+
+
 typedef struct
 {
 /********** ATTENTION **********/
 	int mode;					// Vidomi directly accesses these vars
-	int rc_bitrate;				//
+	int bitrate;				//
 	int desired_size;			// please try to avoid modifications here
 	char stats[MAX_PATH];		//
 /*******************************/
 
+    /* profile  */
     char profile_name[MAX_PATH];
-	int profile;
+	int profile;            /* used internally; *not* written to registry */
 
-	int quality;
-	int	quant;
-	int rc_reaction_delay_factor;
-	int rc_averaging_period;
-	int rc_buffer;
-
-	int motion_search;
-	int quant_type;
-	int fourcc_used;
-	int vhq_mode;
-	int max_key_interval;
-	int min_key_interval;
+    int quant_type;
+	BYTE qmatrix_intra[64];
+	BYTE qmatrix_inter[64];
 	int lum_masking;
 	int interlacing;
 	int qpel;
 	int gmc;
-	int chromame;
-	int greyscale;
+	int reduced_resolution;
     int use_bvop;
 	int max_bframes;
 	int bquant_ratio;
 	int bquant_offset;
-    int bvop_threshold;
 	int packed;
 	int closed_gov;
-	int debug;
-	int reduced_resolution;
 
-	int min_iquant;
-	int max_iquant;
-	int min_pquant;
-	int max_pquant;
-	BYTE qmatrix_intra[64];
-	BYTE qmatrix_inter[64];
+    /* zones */
+    int num_zones;
+    zone_t zones[MAX_ZONES];
+    int cur_zone;        /* used internally; *not* written to registry */
 
+    /* single pass */
+	int rc_reaction_delay_factor;
+	int rc_averaging_period;
+	int rc_buffer;
+
+    /* 2pass2 */
 	int keyframe_boost;
 	int kftreshold;
 	int kfreduction;
@@ -111,25 +124,40 @@
 	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;
-	int hinted_me;
-
-	int num_threads;
-	int chroma_opt;
 
+    /* motion */
+  
+	int motion_search;
+	int vhq_mode;
+	int chromame;
+    int max_key_interval;
+	int min_key_interval;
 	int frame_drop_ratio;
 
-	/* decoder */
+    /* quant */
+	int min_iquant;
+	int max_iquant;
+	int min_pquant;
+	int max_pquant;
+	int min_bquant;
+	int max_bquant;
+    int trellis_quant;
 
-//	int deblock_y;
-//	int deblock_uv;
+    /* debug */
+	int num_threads;
+    int fourcc_used;
+    int debug;
 
 	DWORD cpu;
-	float fquant;
+
+    /* internal */
+    int ci_valid;
+    VFWEXT_CONFIGURE_INFO_T ci;
+
 	BOOL save;
 } CONFIG;
 
@@ -154,6 +182,40 @@
 } REG_STR;
 
 
+#define PROFILE_ADAPTQUANT  0x00000001
+#define PROFILE_BVOP		0x00000002
+#define PROFILE_MPEGQUANT	0x00000004
+#define PROFILE_INTERLACE	0x00000008
+#define PROFILE_QPEL		0x00000010
+#define PROFILE_GMC			0x00000020
+#define PROFILE_REDUCED		0x00000040	/* dynamic resolution conversion */
+
+#define PROFILE_AS			(PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_MPEGQUANT|PROFILE_INTERLACE|PROFILE_QPEL|PROFILE_GMC)
+#define PROFILE_ARTS		(PROFILE_ADAPTQUANT|PROFILE_REDUCED)
+
+
+typedef struct
+{
+	char * name;
+    int id;         /* mpeg-4 profile id; iso/iec 14496-2:2001 table G-1 */
+	int width;
+	int height;
+	int fps;
+	int max_objects;
+	int total_vmv_buffer_sz;    /* macroblock memory; when BVOPS=false, vmv = 2*vcv; when BVOPS=true,  vmv = 3*vcv*/
+	int max_vmv_buffer_sz;	    /* max macroblocks per vop */
+	int vcv_decoder_rate;	/* macroblocks decoded per second */
+	int max_acpred_mbs;	/* percentage */ 
+	int max_vbv_size;			/*    max vbv size (bits) 16368 bits */
+	int max_video_packet_length; /* bits */
+	int max_bitrate;			/* kbits/s */
+	unsigned int flags;
+} profile_t;
+
+
+extern const profile_t profiles[];
+
+
 void config_reg_get(CONFIG * config);
 void config_reg_set(CONFIG * config);