--- xvid.h 2003/09/11 15:28:51 1.27.2.36 +++ xvid.h 2003/10/09 18:50:22 1.27.2.41 @@ -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: xvid.h,v 1.27.2.36 2003/09/11 15:28:51 syskin Exp $ + * $Id: xvid.h,v 1.27.2.41 2003/10/09 18:50:22 edgomez Exp $ * ****************************************************************************/ @@ -45,13 +45,13 @@ memset(&struct,0,sizeof(struct)); struct.version = XVID_VERSION; - XVID_UNSTABLE is defined only during development. + XVID_UNSTABLE is defined only during development. */ #define XVID_MAKE_VERSION(a,b,c) ((((a)&0xff)<<16) | (((b)&0xff)<<8) | ((c)&0xff)) -#define XVID_VERSION_MAJOR(a) (((a)>>16) & 0xff) -#define XVID_VERSION_MINOR(a) (((a)>> 8) & 0xff) -#define XVID_VERSION_PATCH(a) (((a)>> 0) & 0xff) +#define XVID_VERSION_MAJOR(a) ((char)(((a)>>16) & 0xff)) +#define XVID_VERSION_MINOR(a) ((char)(((a)>> 8) & 0xff)) +#define XVID_VERSION_PATCH(a) ((char)(((a)>> 0) & 0xff)) #define XVID_MAKE_API(a,b) ((((a)&0xff)<<16) | (((b)&0xff)<<0)) #define XVID_API_MAJOR(a) (((a)>>16) & 0xff) @@ -62,10 +62,10 @@ #define XVID_UNSTABLE -/* Bitstream Version - * this will be writen into the bitstream to allow easy detection of xvid - * encoder bugs in the decoder, without this it might not possible to - * automatically distinquish between a file which has been encoded with an +/* Bitstream Version + * this will be writen into the bitstream to allow easy detection of xvid + * encoder bugs in the decoder, without this it might not possible to + * automatically distinquish between a file which has been encoded with an * old & buggy XVID from a file which has been encoded with a bugfree version * see the infamous interlacing bug ... * @@ -73,7 +73,7 @@ * doesnt hurt but not increasing it could cause difficulty for decoders in the * future */ -#define XVID_BS_VERSION "0019" +#define XVID_BS_VERSION "0020" /***************************************************************************** @@ -159,7 +159,7 @@ * xvid_global() ****************************************************************************/ -/* cpu_flags definitions */ +/* cpu_flags definitions (make sure to sync this with cpuid.asm for ia32) */ #define XVID_CPU_FORCE (1<<31) /* force passed cpu flags */ #define XVID_CPU_ASM (1<< 7) /* native assembly */ @@ -217,7 +217,6 @@ #define XVID_GBL_INIT 0 /* initialize xvidcore; must be called before using xvid_decore, or xvid_encore) */ #define XVID_GBL_INFO 1 /* return some info about xvidcore, and the host computer */ #define XVID_GBL_CONVERT 2 /* colorspace conversion utility */ -#define XVID_GBL_TEST 3 /* testing.. */ int xvid_global(void *handle, int opt, void *param1, void *param2); @@ -232,7 +231,7 @@ int xvid_decore(void *handle, int opt, void *param1, void *param2); -/* XVID_DEC_CREATE param 1 +/* XVID_DEC_CREATE param 1 image width & height may be specified here when the dimensions are known in advance. */ typedef struct { @@ -360,7 +359,7 @@ int version; xvid_enc_zone_t * zone; /* [out] current zone */ - + int width; /* [out] */ int height; /* [out] */ int mb_width; /* [out] */ @@ -370,7 +369,7 @@ int min_quant[3]; /* [out] */ int max_quant[3]; /* [out] */ - + xvid_image_t reference; /* [out] -> [out] */ xvid_image_t current; /* [out] -> [in,out] */ xvid_image_t original; /* [out] after: points the original (uncompressed) copy of the current frame */ @@ -410,7 +409,7 @@ plugins[0].param = NULL; plugins[1].func = xvid_cbr_func; plugins[1].param = &cbr_data; - + create.num_plugins = 2; create.plugins = plugins; @@ -463,9 +462,9 @@ int bitrate; /* [in] bits per second */ char * filename; /* [in] first pass stats filename */ - + int keyframe_boost; /* [in] keyframe boost percentage: [0..100] */ - int payback_method; /* [in] Payback method: see XVID_PAYBACK flags */ + int payback_method; /* [in] Payback method: see XVID_PAYBACK flags */ int bitrate_payback_delay; /* [in] Payback delay expressed in number of frames */ int curve_compression_high; /* [in] percentage of compression performed on the high part of the curve (above average) */ int curve_compression_low; /* [in] percentage of compression performed on the low part of the curve (below average) */ @@ -540,11 +539,11 @@ #define XVID_ME_ADVANCEDDIAMOND8 (1<< 1) /* use advdiamond for XVID_ME_EXTSEARCH8 */ #define XVID_ME_USESQUARES16 (1<< 2) /* use squares instead of diamonds as search pattern */ #define XVID_ME_USESQUARES8 (1<< 3) /* use square for XVID_ME_EXTSEARCH8 */ -#define XVID_ME_HALFPELREFINE16 (1<< 4) -#define XVID_ME_HALFPELREFINE8 (1<< 6) -#define XVID_ME_QUARTERPELREFINE16 (1<< 7) -#define XVID_ME_QUARTERPELREFINE8 (1<< 8) -#define XVID_ME_GME_REFINE (1<< 9) +#define XVID_ME_HALFPELREFINE16 (1<< 4) +#define XVID_ME_HALFPELREFINE8 (1<< 6) +#define XVID_ME_QUARTERPELREFINE16 (1<< 7) +#define XVID_ME_QUARTERPELREFINE8 (1<< 8) +#define XVID_ME_GME_REFINE (1<< 9) #define XVID_ME_EXTSEARCH16 (1<<10) /* extend PMV by more searches */ #define XVID_ME_EXTSEARCH8 (1<<11) /* use diamond/square for extended 8x8 search */ #define XVID_ME_CHROMA_PVOP (1<<12) /* also use chroma for P_VOP/S_VOP ME */ @@ -627,7 +626,7 @@ int motion; /* [in] ME options */ xvid_image_t input; /* [in] input image (read from) */ - + int type; /* [in:opt] coding type */ int quant; /* [in] frame quantizer; if <=0, automatic (ratecontrol) */ int bframe_threshold; @@ -640,9 +639,9 @@ /* XVID_ENC_ENCODE param2 (optional) - xvid_enc_stats_t describes individual frame details - - coding_type==XVID_TYPE_NOTHING if the stats are not given + xvid_enc_stats_t describes individual frame details + + coding_type==XVID_TYPE_NOTHING if the stats are not given */ typedef struct { int version;