--- xvid.h 2002/10/30 23:11:35 1.17.2.5 +++ xvid.h 2003/01/17 16:07:40 1.17.2.25 @@ -28,7 +28,7 @@ * ToDo ? : when BFRAMES is defined, the API_VERSION should not * be the same (3.0 ?) * -* $Id: xvid.h,v 1.17.2.5 2002/10/30 23:11:35 Isibaar Exp $ +* $Id: xvid.h,v 1.17.2.25 2003/01/17 16:07:40 chl Exp $ * *****************************************************************************/ @@ -46,6 +46,7 @@ /* API Version : 2.1 */ #define API_VERSION ((2 << 16) | (1)) +#define XVID_API_UNSTABLE /* Bitstream Version * this will be writen into the bitstream to allow easy detection of xvid @@ -58,7 +59,7 @@ * doesnt hurt but not increasing it could cause difficulty for decoders in the * future */ -#define XVID_BS_VERSION "0003" +#define XVID_BS_VERSION "0009" /* Error codes */ @@ -95,21 +96,37 @@ ****************************************************************************/ /* CPU flags for XVID_INIT_PARAM.cpu_flags */ +#define XVID_CPU_FORCE 0x80000000 +#define XVID_CPU_CHKONLY 0x40000000 /* check cpu only; dont init globals */ -#define XVID_CPU_MMX 0x00000001 -#define XVID_CPU_MMXEXT 0x00000002 -#define XVID_CPU_SSE 0x00000004 -#define XVID_CPU_SSE2 0x00000008 -#define XVID_CPU_3DNOW 0x00000010 -#define XVID_CPU_3DNOWEXT 0x00000020 - -#define XVID_CPU_TSC 0x00000040 - -#define XVID_CPU_IA64 0x00000080 +#define XVID_CPU_ASM 0x00000080 /* native assembly */ +/* ARCH_X86 */ +#define XVID_CPU_MMX 0x00000001 /* mmx: pentiumMMX,k6 */ +#define XVID_CPU_MMXEXT 0x00000002 /* mmxx-ext: pentium2,athlon */ +#define XVID_CPU_SSE 0x00000004 /* sse: pentium3,athlonXP */ +#define XVID_CPU_SSE2 0x00000008 /* sse2: pentium4,athlon64 */ +#define XVID_CPU_3DNOW 0x00000010 /* 3dnow: k6-2 */ +#define XVID_CPU_3DNOWEXT 0x00000020 /* 3dnow-ext: athlon */ +#define XVID_CPU_TSC 0x00000040 /* timestamp counter */ +/* ARCH_IA64 */ +#define XVID_CPU_IA64 XVID_CPU_ASM /* defined for backward compatibility */ +/* ARCH_PPC */ +#define XVID_CPU_ALTIVEC 0x00000001 /* altivec */ -#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 +#define XVID_INIT_TEST 2 /***************************************************************************** * Initialization structures @@ -123,6 +140,15 @@ } XVID_INIT_PARAM; + typedef struct + { + XVID_IMAGE input; + XVID_IMAGE output; + int width; + int height; + int interlacing; + } XVID_INIT_CONVERTINFO; + /***************************************************************************** * Initialization entry point ****************************************************************************/ @@ -138,6 +164,11 @@ ****************************************************************************/ /* Flags for XVID_DEC_FRAME.general */ +#define XVID_DEC_LOWDELAY 0x00000001 /* decode lowdelay mode (ie. video-for-windows) */ +#define XVID_DEC_DEBLOCKY 0x00000002 /* luma deblocking */ +#define XVID_DEC_DEBLOCKUV 0x00000008 /* chroma deblocking */ +#define XVID_DEC_DISCONTINUITY 0x00000004 /* indicates break in stream; instructs + decoder to ignore any previous reference frames */ #define XVID_QUICK_DECODE 0x00000010 /***************************************************************************** @@ -153,6 +184,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; @@ -197,6 +255,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 @@ -225,10 +284,13 @@ #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_GMC 0x10000000 +#define XVID_GMC_TRANSLATIONAL 0x20000000 + +#define XVID_REDUCED 0x04000000 /* reduced resolution vop */ /* Flags for XVID_ENC_FRAME.motion */ #define PMV_ADVANCEDDIAMOND8 0x00004000 @@ -238,21 +300,35 @@ #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_CHROMA16 0x00100000 /* also use chroma for MB-ME */ #define PMV_UNRESTRICTED16 0x00200000 /* unrestricted ME, not implemented */ #define PMV_OVERLAPPING16 0x00400000 /* overlapping ME, not implemented */ -#define PMV_USESQUARES16 0x00800000 +#define PMV_USESQUARES16 0x00800000 /* use squares instead of diamonds as search pattern */ #define PMV_HALFPELDIAMOND8 0x01000000 #define PMV_HALFPELREFINE8 0x02000000 #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_CHROMA8 0x10000000 /* also use chroma for B-ME */ #define PMV_UNRESTRICTED8 0x20000000 /* unrestricted ME, not implemented */ #define PMV_OVERLAPPING8 0x40000000 /* overlapping ME, not implemented */ #define PMV_USESQUARES8 0x80000000 +/* note: old and deprecated */ + +/* only for compatability with old encoders */ + +#define PMV_EARLYSTOP16 0x00 +#define PMV_EARLYSTOP8 0x00 +#define PMV_QUICKSTOP16 0x00 +#define PMV_QUICKSTOP8 0x00 + +#define XVID_ME_COLOUR 0x00 /* this has been converted to PMV_COLOUR[16/8] */ + + /***************************************************************************** * Encoder structures ****************************************************************************/ @@ -271,7 +347,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). @@ -279,8 +354,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; @@ -325,6 +400,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 */ @@ -335,9 +411,7 @@ */ HINTINFO hint; /* [in/out] mv hint information */ -#ifdef BFRAMES int bquant; /* [in] bframe quantizer */ -#endif } XVID_ENC_FRAME; @@ -348,7 +422,6 @@ int quant; /* [out] frame quantizer */ int hlength; /* [out] header length (bytes) */ int kblks, mblks, ublks; /* [out] */ - } XVID_ENC_STATS;