--- trunk/xvidcore/src/xvid.h 2005/12/09 04:45:35 1660 +++ trunk/xvidcore/src/xvid.h 2006/12/06 19:55:07 1764 @@ -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.53 2005-12-09 04:45:35 syskin Exp $ + * $Id: xvid.h,v 1.60 2006-12-06 19:55:07 Isibaar Exp $ * ****************************************************************************/ @@ -73,7 +73,7 @@ * doesnt hurt but not increasing it could cause difficulty for decoders in the * future */ -#define XVID_BS_VERSION 40 +#define XVID_BS_VERSION 47 /***************************************************************************** * error codes @@ -102,6 +102,7 @@ #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 */ +#define XVID_CSP_RGB (1<<16) /* 24-bit rgb packed */ #define XVID_CSP_BGRA (1<< 6) /* 32-bit bgra packed */ #define XVID_CSP_ABGR (1<< 7) /* 32-bit abgr packed */ #define XVID_CSP_RGBA (1<< 8) /* 32-bit rgba packed */ @@ -169,6 +170,7 @@ #define XVID_CPU_MMXEXT (1<< 1) /* mmx-ext : pentium2, athlon */ #define XVID_CPU_SSE (1<< 2) /* sse : pentium3, athlonXP */ #define XVID_CPU_SSE2 (1<< 3) /* sse2 : pentium4, athlon64 */ +#define XVID_CPU_SSE3 (1<< 8) /* sse3 : pentium4, athlon64 */ #define XVID_CPU_3DNOW (1<< 4) /* 3dnow : k6-2 */ #define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */ #define XVID_CPU_TSC (1<< 6) /* tsc : Pentium */ @@ -485,6 +487,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*/ + /* single pass rate control * CBR and Constant quantizer modes */ @@ -538,6 +542,20 @@ }xvid_plugin_2pass2_t; + +typedef struct{ + /*stat output*/ + int b_printstat; + char* stat_path; + + /*visualize*/ + int b_visualize; + + /*accuracy 0 very accurate 4 very fast*/ + int acc; + +} xvid_plugin_ssim_t; + /***************************************************************************** * ENCODER API ****************************************************************************/