--- xvid.h 2010/09/13 07:38:09 1.68 +++ xvid.h 2010/12/28 16:04:31 1.74.2.1 @@ -3,7 +3,7 @@ * XVID MPEG-4 VIDEO CODEC * - Xvid Main header file - * - * Copyright(C) 2001-2004 Peter Ross + * Copyright(C) 2001-2010 Peter Ross * * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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.68 2010/09/13 07:38:09 Isibaar Exp $ + * $Id: xvid.h,v 1.74.2.1 2010/12/28 16:04:31 Isibaar Exp $ * ****************************************************************************/ @@ -57,11 +57,9 @@ #define XVID_API_MAJOR(a) (((a)>>16) & 0xff) #define XVID_API_MINOR(a) (((a)>> 0) & 0xff) -#define XVID_VERSION XVID_MAKE_VERSION(1,3,-127) +#define XVID_VERSION XVID_MAKE_VERSION(1,3,0) #define XVID_API XVID_MAKE_API(4, 3) -#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 @@ -73,7 +71,7 @@ * doesnt hurt but not increasing it could cause difficulty for decoders in the * future */ -#define XVID_BS_VERSION 57 +#define XVID_BS_VERSION 61 /***************************************************************************** * error codes @@ -246,7 +244,9 @@ int width; /* [in:opt] image width */ int height; /* [in:opt] image width */ void * handle; /* [out] decore context handle */ - int fourcc; /* [in:opt] fourcc of the video */ +/* ------- v1.3.x ------- */ + int fourcc; /* [in:opt] fourcc of the input video */ + int num_threads;/* [in:opt] number of threads to use in decoder */ } xvid_dec_create_t; @@ -370,7 +370,6 @@ #define XVID_REQDQUANTS (1<<2) /* plugin requires access to the dquant table */ #define XVID_REQLAMBDA (1<<3) /* plugin requires access to the lambda table */ - typedef struct { int version; @@ -492,7 +491,8 @@ extern xvid_plugin_func xvid_plugin_psnr; /* write psnr values to stdout */ extern xvid_plugin_func xvid_plugin_dump; /* dump before and after yuvpgms */ -extern xvid_plugin_func xvid_plugin_ssim; /*write ssim values to stdout*/ +extern xvid_plugin_func xvid_plugin_ssim; /*write ssim values to stdout*/ +extern xvid_plugin_func xvid_plugin_psnrhvsm; /*write psnrhvsm values to stdout*/ /* single pass rate control @@ -540,11 +540,13 @@ int container_frame_overhead; /* [in] How many bytes the controller has to compensate per frame due to container format overhead */ /* ------- v1.1.x ------- */ - int vbv_size; /* [in] buffer size (bits) */ + int vbv_size; /* [in] buffer size (bits) If this is zero, VBV check is disabled.*/ int vbv_initial; /* [in] initial buffer occupancy (bits) */ int vbv_maxrate; /* [in] max processing bitrate (bits per second) */ - int vbv_peakrate; /* [in:opt] max average bitrate over 3 seconds (bits per second) */ - + int vbv_peakrate; /* [in:opt] max average bitrate over 1 second (bits per second). + * This is used for diagnostics only and won't affect the actual peak bitrate. + * This is not a problem as long as vbv_peakrate > vbv_size + vbv_maxrate which + * guarantees that vbv_peakrate won't be exceeded. */ }xvid_plugin_2pass2_t; @@ -666,6 +668,7 @@ #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 */ #define XVID_VOP_RD_BVOP (1<<13) /* enable rate-distortion mode decision in b-frames */ +#define XVID_VOP_RD_PSNRHVSM (1<<14) /* use PSNR-HVS-M as metric for rate-distortion optimizations */ /* Only valid for vol_flags|=XVID_VOL_INTERLACING */ #define XVID_VOP_TOPFIELDFIRST (1<< 9) /* set top-field-first flag */ @@ -743,7 +746,7 @@ int num_plugins; /* [in:opt] number of plugins */ xvid_enc_plugin_t * plugins; /* ^^ plugin array */ - int num_threads; /* [in:opt] number of threads */ + int num_threads; /* [in:opt] number of threads to use in encoder */ int max_bframes; /* [in:opt] max sequential bframes (0=disable bframes) */ int global; /* [in:opt] global flags; controls encoding behavior */ @@ -769,6 +772,7 @@ /* ------- v1.3.x ------- */ int start_frame_num; /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */ + int num_slices; /* [in:opt] number of slices to code for each frame */ } xvid_enc_create_t;