--- xvid.h 2003/08/02 15:08:35 1.27.2.30 +++ xvid.h 2003/12/10 15:07:42 1.27.2.51 @@ -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.30 2003/08/02 15:08:35 edgomez Exp $ + * $Id: xvid.h,v 1.27.2.51 2003/12/10 15:07:42 edgomez Exp $ * ****************************************************************************/ @@ -45,27 +45,27 @@ 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) #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,-127) #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 "0016" +#define XVID_BS_VERSION "0023" /***************************************************************************** @@ -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) */ +#define XVID_PAR_11_VGA 1 /* 1:1 vga (square), default if AR is not precised (ie: ==0) */ #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 */ @@ -188,7 +188,7 @@ /* XVID_GBL_INIT param1 */ typedef struct { int version; - int cpu_flags; /* [in:opt] zero = autodetect cpu; XVID_CPU_FORCE|{cpu features} = force cpu features */ + unsigned int cpu_flags; /* [in:opt] zero = autodetect cpu; XVID_CPU_FORCE|{cpu features} = force cpu features */ int debug; /* [in:opt] debug level */ } xvid_gbl_init_t; @@ -198,7 +198,7 @@ int version; int actual_version; /* [out] returns the actual xvidcore version */ const char * build; /* [out] if !null, points to description of this xvid core build */ - int cpu_flags; /* [out] detected cpu features */ + unsigned int cpu_flags; /* [out] detected cpu features */ int num_threads; /* [out] detected number of cpus/threads */ } xvid_gbl_info_t; @@ -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 { @@ -247,6 +246,8 @@ /* 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 */ typedef struct { int version; @@ -278,7 +279,7 @@ 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; /* [out] pixel aspect ratio (refer to XVID_PAR_xxx above) */ int par_width; /* [out] aspect ratio width */ int par_height; /* [out] aspect ratio height */ } vol; @@ -314,7 +315,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 */ @@ -360,7 +362,7 @@ int version; xvid_enc_zone_t * zone; /* [out] current zone */ - + int width; /* [out] */ int height; /* [out] */ int mb_width; /* [out] */ @@ -370,7 +372,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 */ @@ -393,6 +395,8 @@ int sse_y; /* [out] Y plane's sse */ int sse_u; /* [out] U plane's sse */ int sse_v; /* [out] V plane's sse */ + int bquant_ratio; /* [in] */ + int bquant_offset; /* [in] */ } xvid_plg_data_t; @@ -410,7 +414,7 @@ plugins[0].param = NULL; plugins[1].func = xvid_cbr_func; plugins[1].param = &cbr_data; - + create.num_plugins = 2; create.plugins = plugins; @@ -463,18 +467,19 @@ 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 1