--- trunk/xvidcore/src/xvid.h 2009/05/27 15:52:05 1863 +++ trunk/xvidcore/src/xvid.h 2019/05/29 06:02:01 2176 @@ -1,9 +1,9 @@ /***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - XviD Main header file - + * - Xvid Main header file - * - * Copyright(C) 2001-2004 Peter Ross + * Copyright(C) 2001-2011 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,19 +19,30 @@ * 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.65 2009-05-27 15:52:05 Isibaar Exp $ + * $Id$ * ****************************************************************************/ #ifndef _XVID_H_ #define _XVID_H_ - #ifdef __cplusplus extern "C" { #endif /***************************************************************************** + * function export defines + ****************************************************************************/ + +#ifndef XVID_IMPEXP +#define XVID_IMPEXP extern +#endif + +#ifndef XVID_CALL +#define XVID_CALL +#endif + +/***************************************************************************** * versioning ****************************************************************************/ @@ -57,8 +68,8 @@ #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_API XVID_MAKE_API(4, 3) +#define XVID_VERSION XVID_MAKE_VERSION(1,4,-127) +#define XVID_API XVID_MAKE_API(4, 4) #define XVID_UNSTABLE @@ -73,7 +84,7 @@ * doesnt hurt but not increasing it could cause difficulty for decoders in the * future */ -#define XVID_BS_VERSION 55 +#define XVID_BS_VERSION 73 /***************************************************************************** * error codes @@ -129,6 +140,9 @@ #define XVID_PROFILE_S_L1 0x01 #define XVID_PROFILE_S_L2 0x02 #define XVID_PROFILE_S_L3 0x03 +#define XVID_PROFILE_S_L4a 0x04 +#define XVID_PROFILE_S_L5 0x05 +#define XVID_PROFILE_S_L6 0x06 #define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */ #define XVID_PROFILE_ARTS_L2 0x92 #define XVID_PROFILE_ARTS_L3 0x93 @@ -222,7 +236,7 @@ #define XVID_GBL_INFO 1 /* return some info about xvidcore, and the host computer */ #define XVID_GBL_CONVERT 2 /* colorspace conversion utility */ -extern int xvid_global(void *handle, int opt, void *param1, void *param2); +XVID_IMPEXP int XVID_CALL xvid_global(void *handle, int opt, void *param1, void *param2); /***************************************************************************** @@ -233,16 +247,19 @@ #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 */ -extern int xvid_decore(void *handle, int opt, void *param1, void *param2); +XVID_IMPEXP int XVID_CALL xvid_decore(void *handle, int opt, void *param1, void *param2); /* XVID_DEC_CREATE param 1 - image width & height may be specified here when the dimensions are - known in advance. */ + image width & height as well as FourCC code may be specified + here when known in advance (e.g. being read from container) */ typedef struct { int version; - int width; /* [in:opt] image width */ - int height; /* [in:opt] image width */ - void * handle; /* [out] decore context handle */ + int width; /* [in:opt] image width */ + int height; /* [in:opt] image width */ + void * handle; /* [out] decore context handle */ +/* ------- 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; @@ -366,7 +383,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; @@ -444,8 +460,8 @@ int sse_v; /* [out] V plane's sse */ /* End of duplicated data, kept only for binary compatibility */ - int bquant_ratio; /* [in] */ - int bquant_offset; /* [in] */ + int bquant_ratio; /* [out] */ + int bquant_offset; /* [out] */ xvid_enc_stats_t stats; /* [out] frame statistics */ } xvid_plg_data_t; @@ -470,7 +486,7 @@ ****************************************************************************/ -typedef int (xvid_plugin_func)(void * handle, int opt, void * param1, void * param2); +typedef int (XVID_CALL xvid_plugin_func)(void * handle, int opt, void * param1, void * param2); typedef struct { @@ -478,17 +494,17 @@ void * param; } xvid_enc_plugin_t; +XVID_IMPEXP xvid_plugin_func xvid_plugin_single; /* single-pass rate control */ +XVID_IMPEXP xvid_plugin_func xvid_plugin_2pass1; /* two-pass rate control: first pass */ +XVID_IMPEXP 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_IMPEXP xvid_plugin_func xvid_plugin_lumimasking; /* lumimasking */ -extern xvid_plugin_func xvid_plugin_lumimasking; /* lumimasking */ +XVID_IMPEXP xvid_plugin_func xvid_plugin_psnr; /* write psnr values to stdout */ +XVID_IMPEXP 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 */ - -extern xvid_plugin_func xvid_plugin_ssim; /*write ssim values to stdout*/ +XVID_IMPEXP xvid_plugin_func xvid_plugin_ssim; /*write ssim values to stdout*/ +XVID_IMPEXP xvid_plugin_func xvid_plugin_psnrhvsm; /*write psnrhvsm values to stdout*/ /* single pass rate control @@ -536,11 +552,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; @@ -583,7 +601,7 @@ * Encoder entry point *--------------------------------------------------------------------------*/ -extern int xvid_encore(void *handle, int opt, void *param1, void *param2); +XVID_IMPEXP int XVID_CALL xvid_encore(void *handle, int opt, void *param1, void *param2); /* Quick API reference * @@ -662,6 +680,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 */ @@ -739,7 +758,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 */ @@ -762,6 +781,10 @@ /* ---------------------------------------------- */ void *handle; /* [out] encoder instance handle */ + + /* ------- 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;