--- trunk/xvidcore/src/xvid.h	2005/12/09 04:45:35	1660
+++ trunk/xvidcore/src/xvid.h	2010/08/10 14:17:40	1890
@@ -1,7 +1,7 @@
 /*****************************************************************************
  *
  * XVID MPEG-4 VIDEO CODEC
- * - XviD Main header file -
+ * - Xvid Main header file -
  *
  *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
  *
@@ -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.67 2010-08-10 14:17:23 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -57,8 +57,8 @@
 #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
 #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
 
-#define XVID_VERSION             XVID_MAKE_VERSION(1,2,-127)
-#define XVID_API                 XVID_MAKE_API(4, 1)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,3,-127)
+#define XVID_API                 XVID_MAKE_API(4, 3)
 
 #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 40
+#define XVID_BS_VERSION 57 
 
 /*****************************************************************************
  * 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,8 @@
 #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_SSE41    (1<< 9) /*      sse41: penryn */
 #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 */
@@ -233,13 +236,14 @@
 extern int 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 */
+	int fourcc;     /* [in:opt] fourcc of the video */
 } xvid_dec_create_t;
 
 
@@ -485,6 +489,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 +544,28 @@
 
 }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; 
+
+    int cpu_flags; /* XVID_CPU_XXX flags */
+
+} xvid_plugin_ssim_t;
+
+typedef struct {
+        int version;
+
+        int method;      /* [in] masking method to apply. 0 for luminance masking, 1 for variance masking */
+} xvid_plugin_lumimasking_t;
+
 /*****************************************************************************
  *                             ENCODER API
  ****************************************************************************/
@@ -735,6 +763,9 @@
 	/* ---------------------------------------------- */
 
 	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 */
 } xvid_enc_create_t;