--- xvid.h 2003/10/09 18:50:22 1.27.2.41 +++ xvid.h 2003/12/10 01:01:31 1.27.2.50 @@ -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.41 2003/10/09 18:50:22 edgomez Exp $ + * $Id: xvid.h,v 1.27.2.50 2003/12/10 01:01:31 Isibaar Exp $ * ****************************************************************************/ @@ -57,7 +57,7 @@ #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 @@ -73,7 +73,7 @@ * doesnt hurt but not increasing it could cause difficulty for decoders in the * future */ -#define XVID_BS_VERSION "0020" +#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 */ @@ -246,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; @@ -277,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; @@ -313,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 */ @@ -392,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; @@ -464,16 +469,17 @@ 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