--- branches/dev-api-4/xvidcore/vfw/src/config.h 2003/12/05 14:44:35 1242 +++ branches/dev-api-4/xvidcore/vfw/src/config.h 2004/01/24 13:36:00 1329 @@ -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.12 2003-12-05 14:44:35 edgomez Exp $ + * $Id: config.h,v 1.1.2.19 2004-01-24 13:36:00 syskin Exp $ * ****************************************************************************/ #ifndef _CONFIG_H_ @@ -27,6 +27,7 @@ #include #include "vfwext.h" +#include extern HINSTANCE g_hInst; @@ -42,6 +43,7 @@ /* min/max bitrate when not specified by profile */ #define DEFAULT_MIN_KBPS 16 #define DEFAULT_MAX_KBPS 10000 +#define DEFAULT_QUANT 400 /* registry stuff */ #define XVID_REG_KEY HKEY_CURRENT_USER @@ -103,6 +105,7 @@ char stats[MAX_PATH]; /*******************************/ 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]; @@ -122,6 +125,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; @@ -151,6 +158,7 @@ int vhq_mode; int chromame; int cartoon_mode; + int turbo; int max_key_interval; int frame_drop_ratio; @@ -211,6 +219,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 { @@ -240,5 +259,4 @@ BOOL CALLBACK main_proc(HWND, UINT, WPARAM, LPARAM); BOOL CALLBACK about_proc(HWND, UINT, WPARAM, LPARAM); - #endif /* _CONFIG_H_ */