--- branches/dev-api-4/xvidcore/vfw/src/config.h	2003/06/09 13:55:56	1054
+++ branches/dev-api-4/xvidcore/vfw/src/config.h	2004/01/20 14:11:39	1312
@@ -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.7 2003-06-09 13:55:56 edgomez Exp $
+ * $Id: config.h,v 1.1.2.17 2004-01-20 14:11:39 syskin Exp $
  *
  ****************************************************************************/
 #ifndef _CONFIG_H_
@@ -27,6 +27,7 @@
 
 #include <windows.h>
 #include "vfwext.h"
+#include <xvid.h>
 
 extern HINSTANCE g_hInst;
 
@@ -43,7 +44,6 @@
 #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"
@@ -84,10 +84,11 @@
 {
     int frame;
     
+    int type;
     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;
@@ -102,6 +103,7 @@
 	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) */
 
     /* profile  */
     char profile_name[MAX_PATH];
@@ -121,6 +123,10 @@
 	int bquant_offset;
 	int packed;
 	int closed_gov;
+	int display_aspect_ratio;				/* aspect ratio */
+	int ar_x, ar_y;							/* picture aspect ratio */
+	int par_x, par_y;						/* custom pixel aspect ratio */
+	int ar_mode;							/* picture/pixel AR */
 
     /* zones */
     int num_zones;
@@ -132,24 +138,26 @@
 	int rc_averaging_period;
 	int rc_buffer;
 
+    /* 2pass1 */
+	int discard1pass;
+
     /* 2pass2 */
 	int keyframe_boost;
-	int kftreshold;
+	int kfthreshold;
 	int kfreduction;
-	int discard1pass;
 	int curve_compression_high;
 	int curve_compression_low;
+	int overflow_control_strength;
 	int twopass_max_overflow_improvement;
 	int twopass_max_overflow_degradation;
-	int bitrate_payback_delay;
-	int bitrate_payback_method;
 
     /* motion */
 	int motion_search;
 	int vhq_mode;
 	int chromame;
+	int cartoon_mode;
+	int turbo;
     int max_key_interval;
-	int min_key_interval;
 	int frame_drop_ratio;
 
     /* quant */
@@ -166,6 +174,7 @@
     int fourcc_used;
     int vop_debug;
     int debug;
+    int display_status;
 
 	DWORD cpu;
 
@@ -208,6 +217,17 @@
 #define PROFILE_AS			(PROFILE_ADAPTQUANT|PROFILE_BVOP|PROFILE_MPEGQUANT|PROFILE_INTERLACE|PROFILE_QPEL|PROFILE_GMC)
 #define PROFILE_ARTS		(PROFILE_ADAPTQUANT|PROFILE_REDUCED)
 
+static const int PARS[][2] = {
+	{1, 1},
+	{12, 11},
+	{10, 11},
+	{16, 11},
+	{40, 33},
+	{0, 0},
+};
+
+
+
 
 typedef struct
 {
@@ -234,8 +254,10 @@
 void config_reg_get(CONFIG * config);
 void config_reg_set(CONFIG * config);
 
+static void
+zones_update(HWND hDlg, CONFIG * config);
+
 BOOL CALLBACK main_proc(HWND, UINT, WPARAM, LPARAM);
 BOOL CALLBACK about_proc(HWND, UINT, WPARAM, LPARAM);
 
-
 #endif /* _CONFIG_H_ */