--- trunk/xvidcore/src/xvid.h 2010/08/10 14:17:40 1890 +++ trunk/xvidcore/src/xvid.h 2010/11/16 14:42:07 1906 @@ -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.67 2010-08-10 14:17:23 Isibaar Exp $ + * $Id: xvid.h,v 1.70 2010-11-16 14:42:07 Isibaar Exp $ * ****************************************************************************/ @@ -129,6 +129,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 @@ -489,7 +492,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 @@ -537,11 +541,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;