--- xvid.h 2002/07/12 12:26:24 1.14 +++ xvid.h 2002/12/12 10:37:44 1.17.2.14 @@ -28,7 +28,7 @@ * ToDo ? : when BFRAMES is defined, the API_VERSION should not * be the same (3.0 ?) * -* $Id: xvid.h,v 1.14 2002/07/12 12:26:24 suxen_drol Exp $ +* $Id: xvid.h,v 1.17.2.14 2002/12/12 10:37:44 suxen_drol Exp $ * *****************************************************************************/ @@ -37,7 +37,7 @@ #define _XVID_H_ #ifdef __cplusplus -* $Id: xvid.h,v 1.14 2002/07/12 12:26:24 suxen_drol Exp $ +extern "C" { #endif /***************************************************************************** @@ -47,6 +47,19 @@ /* API Version : 2.1 */ #define API_VERSION ((2 << 16) | (1)) +/* 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 ... + * + * this MUST be increased if an encoder bug is fixed, increasing it too often + * doesnt hurt but not increasing it could cause difficulty for decoders in the + * future + */ +#define XVID_BS_VERSION "0003" + /* Error codes */ #define XVID_ERR_FAIL -1 @@ -56,7 +69,7 @@ /* Colorspaces */ -#define XVID_CSP_RGB24 0 +#define XVID_CSP_RGB24 0 /* [b|g|r] */ #define XVID_CSP_YV12 1 #define XVID_CSP_YUY2 2 #define XVID_CSP_UYVY 3 @@ -66,13 +79,19 @@ #define XVID_CSP_USER 12 #define XVID_CSP_EXTERN 1004 // per slice rendering #define XVID_CSP_YVYU 1002 -#define XVID_CSP_RGB32 1000 +#define XVID_CSP_RGB32 1000 /* [b|g|r|a] */ +#define XVID_CSP_ABGR 1006 /* [a|b|g|r] */ +#define XVID_CSP_RGBA 1005 /* [r|g|b|a] */ + + + #define XVID_CSP_NULL 9999 #define XVID_CSP_VFLIP 0x80000000 // flip mask /***************************************************************************** + * Initialization constants ****************************************************************************/ /* CPU flags for XVID_INIT_PARAM.cpu_flags */ @@ -91,6 +110,18 @@ #define XVID_CPU_CHKONLY 0x40000000 /* check cpu only; dont init globals */ #define XVID_CPU_FORCE 0x80000000 + typedef struct + { + int colorspace; + void * y; + void * u; + void * v; + int y_stride; + int uv_stride; + } XVID_IMAGE; /* from yv12 */ + +#define XVID_INIT_INIT 0 +#define XVID_INIT_CONVERT 1 /***************************************************************************** * Initialization structures @@ -104,6 +135,15 @@ } XVID_INIT_PARAM; + typedef struct + { + XVID_IMAGE input; + XVID_IMAGE output; + int width; + int height; + int interlacing; + } XVID_INIT_CONVERTINFO; + /***************************************************************************** * Initialization entry point ****************************************************************************/ @@ -119,6 +159,7 @@ ****************************************************************************/ /* Flags for XVID_DEC_FRAME.general */ +#define XVID_DEC_LOWDELAY 0x00000001 /* decode lowdelay mode (ie. video-for-windows) */ #define XVID_QUICK_DECODE 0x00000010 /***************************************************************************** @@ -134,6 +175,33 @@ XVID_DEC_PARAM; +#define XVID_DEC_VOP 0 +#define XVID_DEC_VOL 1 +#define XVID_DEC_NOTHING 2 /* nothing was decoded */ + + typedef struct + { + int notify; /* [out] output 'mode' */ + union + { + struct /* XVID_DEC_VOP */ + { + int time_base; /* [out] time base */ + int time_increment; /* [out] time increment */ + } vop; + struct /* XVID_DEC_VOL */ + { + int general; /* [out] flags: eg. frames are interlaced */ + int width; /* [out] width */ + int height; /* [out] height */ + int aspect_ratio; /* [out] aspect ratio */ + int par_width; /* [out] aspect ratio width */ + int par_height; /* [out] aspect ratio height */ + } vol; + } data; + } XVID_DEC_STATS; + + typedef struct { int general; @@ -154,6 +222,14 @@ int stride_y, stride_u,stride_v; } XVID_DEC_PICTURE; + +/***************************************************************************** + * Decoder entry point + ****************************************************************************/ + +/* decoder options */ +#define XVID_DEC_DECODE 0 +#define XVID_DEC_CREATE 1 #define XVID_DEC_DESTROY 2 int xvid_decore(void *handle, @@ -170,6 +246,7 @@ #define XVID_GLOBAL_PACKED 0x00000001 /* packed bitstream */ #define XVID_GLOBAL_DX50BVOP 0x00000002 /* dx50 bvop compatibility */ #define XVID_GLOBAL_DEBUG 0x00000004 /* print debug info on each frame */ +#define XVID_GLOBAL_REDUCED 0x04000000 /* reduced resolution vop enable */ /* Flags for XVID_ENC_FRAME.general */ #define XVID_VALID_FLAGS 0x80000000 @@ -178,6 +255,7 @@ #define XVID_H263QUANT 0x00000010 #define XVID_MPEGQUANT 0x00000020 #define XVID_HALFPEL 0x00000040 /* use halfpel interpolation */ +#define XVID_QUARTERPEL 0x02000000 #define XVID_ADAPTIVEQUANT 0x00000080 #define XVID_LUMIMASKING 0x00000100 #define XVID_LATEINTRA 0x00000200 @@ -197,15 +275,22 @@ #define XVID_ME_PMVFAST 0x00080000 #define XVID_ME_EPZS 0x00100000 - #define XVID_GREYSCALE 0x01000000 /* enable greyscale only mode (even for */ -#define XVID_GRAYSCALE 0x01000000 /* color input material chroma is ignored) */ +#define XVID_GRAYSCALE 0x01000000 /* color input material chroma is ignored) */ +#define XVID_GMC 0x20000000 +#define XVID_ME_COLOUR 0x40000000 + +#define XVID_REDUCED 0x04000000 /* reduced resolution vop */ /* Flags for XVID_ENC_FRAME.motion */ #define PMV_ADVANCEDDIAMOND8 0x00004000 #define PMV_ADVANCEDDIAMOND16 0x00008000 -#define PMV_EARLYSTOP16 0x00080000 + +#define PMV_HALFPELDIAMOND16 0x00010000 +#define PMV_HALFPELREFINE16 0x00020000 +#define PMV_QUARTERPELREFINE16 0x00040000 +#define PMV_EXTSEARCH16 0x00080000 /* extend PMV by more searches */ #define PMV_QUICKSTOP16 0x00100000 /* like early, but without any more refinement */ #define PMV_UNRESTRICTED16 0x00200000 /* unrestricted ME, not implemented */ #define PMV_OVERLAPPING16 0x00400000 /* overlapping ME, not implemented */ @@ -213,14 +298,15 @@ #define PMV_HALFPELDIAMOND8 0x01000000 #define PMV_HALFPELREFINE8 0x02000000 -#define PMV_EXTSEARCH8 0x04000000 /* extend PMV by more searches */ -#define PMV_EARLYSTOP8 0x08000000 +#define PMV_QUARTERPELREFINE8 0x04000000 +#define PMV_EXTSEARCH8 0x08000000 /* extend PMV by more searches */ #define PMV_QUICKSTOP8 0x10000000 /* like early, but without any more refinement */ #define PMV_UNRESTRICTED8 0x20000000 /* unrestricted ME, not implemented */ #define PMV_OVERLAPPING8 0x40000000 /* overlapping ME, not implemented */ #define PMV_USESQUARES8 0x80000000 + /***************************************************************************** * Encoder structures ****************************************************************************/ @@ -239,7 +325,6 @@ #ifdef _SMP int num_threads; /* number of threads */ #endif -#ifdef BFRAMES int global; /* global/debug options */ int max_bframes; /* max sequential bframes (0=disable bframes) */ int bquant_ratio; /* bframe quantizer multipier (percentage). @@ -247,8 +332,8 @@ * eg. 200 = x2 multiplier * quant = ((past_quant + future_quant) * bquant_ratio)/200 */ + int bquant_offset; /* bquant += bquant_offset */ int frame_drop_ratio; /* frame dropping: 0=drop none... 100=drop all */ -#endif void *handle; /* [out] encoder instance handle */ } XVID_ENC_PARAM; @@ -256,6 +341,7 @@ typedef struct { int x; + int y; } VECTOR; @@ -292,6 +378,7 @@ int length; /* [out] bitstream length (bytes) */ void *image; /* [in] image ptr */ + int stride; int colorspace; /* [in] source colorspace */ unsigned char *quant_intra_matrix; // [in] custom intra qmatrix */ @@ -302,9 +389,7 @@ */ HINTINFO hint; /* [in/out] mv hint information */ -#ifdef BFRAMES int bquant; /* [in] bframe quantizer */ -#endif } XVID_ENC_FRAME; @@ -315,7 +400,6 @@ int quant; /* [out] frame quantizer */ int hlength; /* [out] header length (bytes) */ int kblks, mblks, ublks; /* [out] */ - } XVID_ENC_STATS;