--- branches/dev-api-4/xvidcore/vfw/src/config.h	2004/01/31 13:44:56	1345
+++ branches/dev-api-4/xvidcore/vfw/src/config.h	2004/01/31 14:03:26	1346
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: config.h,v 1.1.2.20 2004-01-26 03:16:53 suxen_drol Exp $
+ * $Id: config.h,v 1.1.2.21 2004-01-31 14:03:26 syskin Exp $
  *
  ****************************************************************************/
 #ifndef _CONFIG_H_
@@ -41,8 +41,8 @@
 #define CONFIG_KBPS 1000
 
 /* min/max bitrate when not specified by profile */
-#define DEFAULT_MIN_KBPS    16
-#define DEFAULT_MAX_KBPS    10000
+#define DEFAULT_MIN_KBPS	16
+#define DEFAULT_MAX_KBPS	10000
 #define DEFAULT_QUANT		400
 
 /* registry stuff */
@@ -59,13 +59,13 @@
 #define CONFIG_2PASS_FILE "\\video.pass"
 
 /* codec modes */
-#define RC_MODE_1PASS          0
-#define RC_MODE_2PASS1         1
-#define RC_MODE_2PASS2         2
-#define RC_MODE_NULL           3
+#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
+#define RC_ZONE_WEIGHT		 0
+#define RC_ZONE_QUANT		  1
 
 /* vhq modes */
 #define VHQ_OFF					0
@@ -80,19 +80,19 @@
 #define QUANT_MODE_CUSTOM		2
 
 
-#define MAX_ZONES    64
+#define MAX_ZONES	64
 typedef struct
 {
-    int frame;
-    
-    int type;
-    int mode;
-    int weight;
-    int quant;
-
-    unsigned int greyscale;
-    unsigned int chroma_opt;
-    unsigned int bvop_threshold;
+	int frame;
+	
+	int type;
+	int mode;
+	int weight;
+	int quant;
+
+	unsigned int greyscale;
+	unsigned int chroma_opt;
+	unsigned int bvop_threshold;
 } zone_t;
 
 
@@ -104,14 +104,14 @@
 	int desired_size;			/* please try to avoid modifications here */
 	char stats[MAX_PATH];		
 /*******************************/
-    int use_2pass_bitrate;        /* use bitrate for 2pass2 (instead of desired size) */
+	int use_2pass_bitrate;		/* use bitrate for 2pass2 (instead of desired size) */
 	int desired_quant;			/* for one-pass constant quant */
 
-    /* profile  */
-    char profile_name[MAX_PATH];
-	int profile;            /* used internally; *not* written to registry */
+	/* profile  */
+	char profile_name[MAX_PATH];
+	int profile;			/* used internally; *not* written to registry */
 
-    int quant_type;
+	int quant_type;
 	BYTE qmatrix_intra[64];
 	BYTE qmatrix_inter[64];
 	int lum_masking;
@@ -119,7 +119,7 @@
 	int qpel;
 	int gmc;
 	int reduced_resolution;
-    int use_bvop;
+	int use_bvop;
 	int max_bframes;
 	int bquant_ratio;
 	int bquant_offset;
@@ -130,20 +130,20 @@
 	int par_x, par_y;						/* custom pixel aspect ratio */
 	int ar_mode;							/* picture/pixel AR */
 
-    /* zones */
-    int num_zones;
-    zone_t zones[MAX_ZONES];
-    int cur_zone;        /* used internally; *not* written to registry */
+	/* zones */
+	int num_zones;
+	zone_t zones[MAX_ZONES];
+	int cur_zone;		/* used internally; *not* written to registry */
 
-    /* single pass */
+	/* single pass */
 	int rc_reaction_delay_factor;
 	int rc_averaging_period;
 	int rc_buffer;
 
-    /* 2pass1 */
+	/* 2pass1 */
 	int discard1pass;
 
-    /* 2pass2 */
+	/* 2pass2 */
 	int keyframe_boost;
 	int kfthreshold;
 	int kfreduction;
@@ -166,36 +166,37 @@
 	int audio_rate;
 	int audio_size;
 
-    /* motion */
+	/* motion */
 	int motion_search;
 	int vhq_mode;
 	int chromame;
 	int cartoon_mode;
 	int turbo;
-    int max_key_interval;
+	int max_key_interval;
 	int frame_drop_ratio;
 
-    /* quant */
+	/* quant */
 	int min_iquant;
 	int max_iquant;
 	int min_pquant;
 	int max_pquant;
 	int min_bquant;
 	int max_bquant;
-    int trellis_quant;
+	int trellis_quant;
 
-    /* debug */
+	/* debug */
 	int num_threads;
-    int fourcc_used;
-    int vop_debug;
-    int debug;
-    int display_status;
+	int fourcc_used;
+	int vop_debug;
+	int debug;
+	int display_status;
+	int full1pass;
 
 	DWORD cpu;
 
-    /* internal */
-    int ci_valid;
-    VFWEXT_CONFIGURE_INFO_T ci;
+	/* internal */
+	int ci_valid;
+	VFWEXT_CONFIGURE_INFO_T ci;
 
 	BOOL save;
 } CONFIG;
@@ -247,16 +248,16 @@
 typedef struct
 {
 	char * name;
-    int id;         /* mpeg-4 profile id; iso/iec 14496-2:2001 table G-1 */
+	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 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_vbv_size;			/*	max vbv size (bits) 16368 bits */
 	int max_video_packet_length; /* bits */
 	int max_bitrate;			/* kbits/s */
 	unsigned int flags;