--- xvid.h 2003/09/28 13:43:47 1.27.2.37 +++ xvid.h 2003/12/18 14:47:44 1.27.2.58 @@ -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.37 2003/09/28 13:43:47 edgomez Exp $ + * $Id: xvid.h,v 1.27.2.58 2003/12/18 14:47:44 edgomez Exp $ * ****************************************************************************/ @@ -45,7 +45,7 @@ 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)) @@ -57,15 +57,15 @@ #define XVID_API_MAJOR(a) (((a)>>16) & 0xff) #define XVID_API_MINOR(a) (((a)>> 0) & 0xff) -#define XVID_VERSION XVID_MAKE_VERSION(1,-127,0) +#define XVID_VERSION XVID_MAKE_VERSION(1,0,-126) #define XVID_API XVID_MAKE_API(4, 0) #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 "0024" /***************************************************************************** @@ -96,9 +96,9 @@ /* colorspace values */ -#define XVID_CSP_USER (1<< 0) /* 4:2:0 planar */ -#define XVID_CSP_I420 (1<< 1) /* 4:2:0 packed(planar win32) */ -#define XVID_CSP_YV12 (1<< 2) /* 4:2:0 packed(planar win32) */ +#define XVID_CSP_USER (1<< 0) /* 4:2:0 planar (==I420, except for pointers/strides) */ +#define XVID_CSP_I420 (1<< 1) /* 4:2:0 planar */ +#define XVID_CSP_YV12 (1<< 2) /* 4:2:0 planar */ #define XVID_CSP_YUY2 (1<< 3) /* 4:2:2 packed */ #define XVID_CSP_UYVY (1<< 4) /* 4:2:2 packed */ #define XVID_CSP_YVYU (1<< 5) /* 4:2:2 packed */ @@ -138,7 +138,7 @@ #define XVID_PROFILE_AS_L4 0xf4 /* aspect ratios */ -#define XVID_PAR_11_VGA 1 /* 1:1 vga (square), default if AR is not precised (ie: ==0) */ +#define XVID_PAR_11_VGA 1 /* 1:1 vga (square), default if supplied PAR is not a valid value */ #define XVID_PAR_43_PAL 2 /* 4:3 pal (12:11 625-line) */ #define XVID_PAR_43_NTSC 3 /* 4:3 ntsc (10:11 525-line) */ #define XVID_PAR_169_PAL 4 /* 16:9 pal (16:11 625-line) */ @@ -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,9 +217,8 @@ #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); +extern int xvid_global(void *handle, int opt, void *param1, void *param2); /***************************************************************************** @@ -230,9 +229,9 @@ #define XVID_DEC_DESTROY 1 /* destroy decore instance: return 0 on success */ #define XVID_DEC_DECODE 2 /* decode a frame: returns number of bytes consumed >= 0 */ -int xvid_decore(void *handle, int opt, void *param1, void *param2); +extern 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 { @@ -247,6 +246,9 @@ /* general flags */ #define XVID_LOWDELAY (1<<0) /* lowdelay mode */ #define XVID_DISCONTINUITY (1<<1) /* indicates break in stream */ +#define XVID_DEBLOCKY (1<<2) /* perform luma deblocking */ +#define XVID_DEBLOCKUV (1<<3) /* perform chroma deblocking */ +#define XVID_FILMEFFECT (1<<4) /* adds film grain */ typedef struct { int version; @@ -278,15 +280,13 @@ int general; /* [out] flags */ int width; /* [out] width */ int height; /* [out] height */ - int par; /* [out] picture aspect ratio (refer to XVID_PAR_xxx above) */ - int par_width; /* [out] aspect ratio width */ - int par_height; /* [out] aspect ratio height */ + int par; /* [out] pixel aspect ratio (refer to XVID_PAR_xxx above) */ + int par_width; /* [out] aspect ratio width [1..255] */ + int par_height; /* [out] aspect ratio height [1..255] */ } vol; } data; } xvid_dec_stats_t; - - #define XVID_ZONE_QUANT (1<<0) #define XVID_ZONE_WEIGHT (1<<1) @@ -299,6 +299,37 @@ } xvid_enc_zone_t; +/*---------------------------------------------------------------------------- + * xvid_enc_stats_t structure + * + * Used in: + * - xvid_plg_data_t structure + * - optional parameter in xvid_encore() function + * + * .coding_type = XVID_TYPE_NOTHING if the stats are not given + *--------------------------------------------------------------------------*/ + +typedef struct { + int version; + + /* encoding parameters */ + int type; /* [out] coding type */ + int quant; /* [out] frame quantizer */ + int vol_flags; /* [out] vol flags (see above) */ + int vop_flags; /* [out] vop flags (see above) */ + + /* bitrate */ + int length; /* [out] frame length */ + + int hlength; /* [out] header length (bytes) */ + int kblks; /* [out] number of blocks compressed as Intra */ + int mblks; /* [out] number of blocks compressed as Inter */ + int ublks; /* [out] number of blocks marked as not_coded */ + + int sse_y; /* [out] Y plane's sse */ + int sse_u; /* [out] U plane's sse */ + int sse_v; /* [out] V plane's sse */ +} xvid_enc_stats_t; /***************************************************************************** xvid plugin system -- internals @@ -314,7 +345,8 @@ #define XVID_PLG_DESTROY (1<<1) #define XVID_PLG_INFO (1<<2) #define XVID_PLG_BEFORE (1<<3) -#define XVID_PLG_AFTER (1<<4) +#define XVID_PLG_FRAME (1<<4) +#define XVID_PLG_AFTER (1<<5) /* xvid_plg_info_t.flags */ #define XVID_REQORIGINAL (1<<0) /* plugin requires a copy of the original (uncompressed) image */ @@ -354,13 +386,12 @@ int num_frames; /* [out] total frame encoded */ } xvid_plg_destroy_t; - typedef struct { int version; xvid_enc_zone_t * zone; /* [out] current zone */ - + int width; /* [out] */ int height; /* [out] */ int mb_width; /* [out] */ @@ -370,7 +401,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 */ @@ -386,6 +417,8 @@ int vol_flags; /* [in,out] */ int motion_flags; /* [in,out] */ +/* Deprecated, use the stats field instead. + * Will disapear before 1.0 */ int length; /* [out] after: length of encoded frame */ int kblks; /* [out] number of blocks compressed as Intra */ int mblks; /* [out] number of blocks compressed as Inter */ @@ -393,8 +426,13 @@ int sse_y; /* [out] Y plane's sse */ int sse_u; /* [out] U plane's sse */ int sse_v; /* [out] V plane's sse */ -} xvid_plg_data_t; +/* End of duplicated data, kept only for binary compatibility */ + int bquant_ratio; /* [in] */ + int bquant_offset; /* [in] */ + + xvid_enc_stats_t stats; /* [out] frame statistics */ +} xvid_plg_data_t; /***************************************************************************** xvid plugin system -- external @@ -410,7 +448,7 @@ plugins[0].param = NULL; plugins[1].func = xvid_cbr_func; plugins[1].param = &cbr_data; - + create.num_plugins = 2; create.plugins = plugins; @@ -425,14 +463,14 @@ } xvid_enc_plugin_t; -xvid_plugin_func xvid_plugin_single; /* single-pass rate control */ -xvid_plugin_func xvid_plugin_2pass1; /* two-pass rate control: first pass */ -xvid_plugin_func xvid_plugin_2pass2; /* two-pass rate control: second pass */ +extern xvid_plugin_func xvid_plugin_single; /* single-pass rate control */ +extern xvid_plugin_func xvid_plugin_2pass1; /* two-pass rate control: first pass */ +extern xvid_plugin_func xvid_plugin_2pass2; /* two-pass rate control: second pass */ -xvid_plugin_func xvid_plugin_lumimasking; /* lumimasking */ +extern xvid_plugin_func xvid_plugin_lumimasking; /* lumimasking */ -xvid_plugin_func xvid_plugin_psnr; /* write psnr values to stdout */ -xvid_plugin_func xvid_plugin_dump; /* dump before and after yuvpgms */ +extern xvid_plugin_func xvid_plugin_psnr; /* write psnr values to stdout */ +extern xvid_plugin_func xvid_plugin_dump; /* dump before and after yuvpgms */ /* single pass rate control @@ -463,38 +501,75 @@ 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 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) */ - int max_overflow_improvement; /* [in] */ - int max_overflow_degradation; /* [in] */ - - int kftreshold; /* [in] */ - int kfreduction; /* [in] */ - int min_key_interval; /* [in] Minimum interval of frames between two IFrames */ + int overflow_control_strength;/* [in] Payback delay expressed in number of frames */ + int max_overflow_improvement; /* [in] percentage of allowed range for a frame that gets bigger because of overflow bonus */ + int max_overflow_degradation; /* [in] percentage of allowed range for a frame that gets smaller because of overflow penalty */ + + int kfreduction; /* [in] maximum bitrate reduction applied to an iframe under the kfthreshold distance limit */ + int kfthreshold; /* [in] if an iframe is closer to the next iframe than this distance, a quantity of bits + * is substracted from its bit allocation. The reduction is computed as multiples of + * kfreduction/kthreshold. It reaches kfreduction when the distance == kfthreshold, + * 0 for 1global field during instance + * creation (operation XVID_ENC_CREATE) + *--------------------------------------------------------------------------*/ -/* Global Flags */ #define XVID_GLOBAL_PACKED (1<<0) /* packed bitstream */ #define XVID_GLOBAL_CLOSED_GOP (1<<1) /* closed_gop: was DX50BVOP dx50 bvop compatibility */ #define XVID_GLOBAL_EXTRASTATS_ENABLE (1<<2) @@ -504,8 +579,13 @@ #endif -/* XVID_ENC_ENCODE param1 */ -/* vol-based flags */ +/*---------------------------------------------------------------------------- + * "VOL" flags + * + * These flags are used for xvid_enc_frame_t->vol_flags field during frame + * encoding (operation XVID_ENC_ENCODE) + *--------------------------------------------------------------------------*/ + #define XVID_VOL_MPEGQUANT (1<<0) /* enable MPEG type quantization */ #define XVID_VOL_EXTRASTATS (1<<1) /* enable plane sse stats */ #define XVID_VOL_QUARTERPEL (1<<2) /* enable quarterpel: frames will encoded as quarterpel */ @@ -514,43 +594,60 @@ #define XVID_VOL_INTERLACING (1<<5) /* enable interlaced encoding */ +/*---------------------------------------------------------------------------- + * "VOP" flags + * + * These flags are used for xvid_enc_frame_t->vop_flags field during frame + * encoding (operation XVID_ENC_ENCODE) + *--------------------------------------------------------------------------*/ + +/* Always valid */ +#define XVID_VOP_DEBUG (1<< 0) /* print debug messages in frames */ +#define XVID_VOP_HALFPEL (1<< 1) /* use halfpel interpolation */ +#define XVID_VOP_INTER4V (1<< 2) /* use 4 motion vectors per MB */ +#define XVID_VOP_TRELLISQUANT (1<< 3) /* use trellis based R-D "optimal" quantization */ +#define XVID_VOP_CHROMAOPT (1<< 4) /* enable chroma optimization pre-filter */ +#define XVID_VOP_CARTOON (1<< 5) /* use 'cartoon mode' */ +#define XVID_VOP_GREYSCALE (1<< 6) /* enable greyscale only mode (even for color input material chroma is ignored) */ +#define XVID_VOP_HQACPRED (1<< 7) /* high quality ac prediction */ +#define XVID_VOP_MODEDECISION_RD (1<< 8) /* enable DCT-ME and use it for mode decision */ +#define XVID_VOP_FAST_MODEDECISION_RD (1<<12) /* use simplified R-D mode decision */ + +/* Only valid for vol_flags|=XVID_VOL_INTERLACING */ +#define XVID_VOP_TOPFIELDFIRST (1<< 9) /* set top-field-first flag */ +#define XVID_VOP_ALTERNATESCAN (1<<10) /* set alternate vertical scan flag */ -/* vop based flags */ -#define XVID_VOP_DEBUG (1<< 0) -#define XVID_VOP_HALFPEL (1<< 1) /* use halfpel interpolation */ -#define XVID_VOP_INTER4V (1<< 2) -#define XVID_VOP_TRELLISQUANT (1<< 3) /* use trellis based R-D "optimal" quantization */ -#define XVID_VOP_CHROMAOPT (1<< 4) /* enable chroma optimization pre-filter */ -#define XVID_VOP_CARTOON (1<< 5) /* use 'cartoon mode' */ -#define XVID_VOP_GREYSCALE (1<< 6) /* enable greyscale only mode (even for color input material chroma is ignored) */ -#define XVID_VOP_HQACPRED (1<< 7) /* high quality ac prediction */ -#define XVID_VOP_MODEDECISION_RD (1<< 8) /* enable DCT-ME and use it for mode decision */ -/* only valid for vol_flags|=XVID_VOL_INTERLACING */ -#define XVID_VOP_TOPFIELDFIRST (1<< 9) /* set top-field-first flag */ -#define XVID_VOP_ALTERNATESCAN (1<<10) /* set alternate vertical scan flag */ /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */ -#define XVID_VOP_REDUCED (1<<11) /* reduced resolution vop */ - -#define XVID_VOP_FAST_MODEDECISION_RD (1<< 12) /* use simplified R-D mode decision */ +#define XVID_VOP_REDUCED (1<<11) /* reduced resolution vop */ +/*---------------------------------------------------------------------------- + * "Motion" flags + * + * These flags are used for xvid_enc_frame_t->motion field during frame + * encoding (operation XVID_ENC_ENCODE) + *--------------------------------------------------------------------------*/ -/* Motion based flags */ +/* Motion Estimation Search Patterns */ #define XVID_ME_ADVANCEDDIAMOND16 (1<< 0) /* use advdiamonds instead of diamonds as search pattern */ #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) + +/* SAD operator based flags */ +#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 */ #define XVID_ME_CHROMA_BVOP (1<<13) /* also use chroma for B_VOP ME */ +#define XVID_ME_FASTREFINE16 (1<<25) /* use low-complexity refinement functions */ -/* Motion search using DCT. use XVID_VOP_MODEDECISION_BITS to enable */ +/* Rate Distortion based flags + * Valid when XVID_VOP_MODEDECISION_BITS is enabled */ #define XVID_ME_HALFPELREFINE16_RD (1<<14) /* perform RD-based halfpel refinement */ #define XVID_ME_HALFPELREFINE8_RD (1<<15) /* perform RD-based halfpel refinement for 8x8 mode */ #define XVID_ME_QUARTERPELREFINE16_RD (1<<16) /* perform RD-based qpel refinement */ @@ -558,15 +655,26 @@ #define XVID_ME_EXTSEARCH_RD (1<<18) /* perform RD-based search using square pattern enable XVID_ME_EXTSEARCH8 to do this in 8x8 search as well */ #define XVID_ME_CHECKPREDICTION_RD (1<<19) /* always check vector equal to prediction */ +/* Other */ +#define XVID_ME_DETECT_STATIC_MOTION (1<<24) /* speed-up ME by detecting stationary scenes */ +#define XVID_ME_SKIP_DELTASEARCH (1<<26) /* speed-up by skipping b-frame delta search */ +#define XVID_ME_FAST_MODEINTERPOLATE (1<<27) /* speed-up by partly skipping interpolate mode */ +#define XVID_ME_BFRAME_EARLYSTOP (1<<28) /* speed-up by early exiting b-search */ + +/* Unused */ #define XVID_ME_UNRESTRICTED16 (1<<20) /* unrestricted ME, not implemented */ #define XVID_ME_OVERLAPPING16 (1<<21) /* overlapping ME, not implemented */ #define XVID_ME_UNRESTRICTED8 (1<<22) /* unrestricted ME, not implemented */ #define XVID_ME_OVERLAPPING8 (1<<23) /* overlapping ME, not implemented */ -#define XVID_ME_DETECT_STATIC_MOTION (1<<24) /* speed-up ME by detecting stationary scenes */ -#define XVID_ME_FASTREFINE16 (1<<25) /* use low-complexity refinement functions */ -/* XVID_ENC_CREATE param1 */ +/*---------------------------------------------------------------------------- + * xvid_enc_create_t structure definition + * + * This structure is passed as param1 during an instance creation (operation + * XVID_ENC_CREATE) + *--------------------------------------------------------------------------*/ + typedef struct { int version; @@ -603,31 +711,46 @@ /* ---------------------------------------------- */ void *handle; /* [out] encoder instance handle */ -} -xvid_enc_create_t; +} xvid_enc_create_t; +/*---------------------------------------------------------------------------- + * xvid_enc_frame_t structure definition + * + * This structure is passed as param1 during a frame encoding (operation + * XVID_ENC_ENCODE) + *--------------------------------------------------------------------------*/ + +/* out value for the frame structure->type field + * unlike stats output in param2, this field is not asynchronous and tells + * the client app, if the frame written into the stream buffer is an ivop + * usually used for indexing purpose in the container */ #define XVID_KEYFRAME (1<<1) +/* The structure */ typedef struct { int version; - /* --- VOL related stuff; unless XVID_FORCEVOL is set, the encoder will not react to any changes here until the next VOL (keyframe). */ + /* VOL related stuff + * unless XVID_FORCEVOL is set, the encoder will not react to any changes + * here until the next VOL (keyframe). */ + int vol_flags; /* [in] vol flags */ unsigned char *quant_intra_matrix; /* [in:opt] custom intra qmatrix */ unsigned char *quant_inter_matrix; /* [in:opt] custom inter qmatrix */ - int par; /* [in:opt] picture aspect ratio (refer to XVID_PAR_xxx above) */ + int par; /* [in:opt] pixel aspect ratio (refer to XVID_PAR_xxx above) */ int par_width; /* [in:opt] aspect ratio width */ int par_height; /* [in:opt] aspect ratio height */ - /* ---------------------------------------------- */ + + /* Other fields that can change on a frame base */ int fincr; /* [in:opt] framerate increment, for variable framerate only */ int vop_flags; /* [in] (general)vop-based flags */ 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; @@ -638,37 +761,8 @@ int out_flags; /* [out] bitstream output flags */ } xvid_enc_frame_t; - -/* XVID_ENC_ENCODE param2 (optional) - xvid_enc_stats_t describes individual frame details - - coding_type==XVID_TYPE_NOTHING if the stats are not given -*/ -typedef struct { - int version; - - /* encoding parameters */ - int type; /* [out] coding type */ - int quant; /* [out] frame quantizer */ - int vol_flags; /* [out] vol flags (see above) */ - int vop_flags; /* [out] vop flags (see above) */ - - /* bitrate */ - int length; /* [out] frame length */ - - int hlength; /* [out] header length (bytes) */ - int kblks; /* [out] number of blocks compressed as Intra */ - int mblks; /* [out] number of blocks compressed as Inter */ - int ublks; /* [out] number of blocks marked as not_coded */ - - int sse_y; /* [out] Y plane's sse */ - int sse_u; /* [out] U plane's sse */ - int sse_v; /* [out] V plane's sse */ -} xvid_enc_stats_t; - #ifdef __cplusplus } #endif - #endif