enable ssse3 phadd satd on Penryn.

[x264] / x264.h

diff --git a/x264.h b/x264.h
index f4fd1d13e0fca91e2a6a32b531769f2041245e59..7b3904951c68593c708e0d50a02f5fd9471e16d3 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _X264_H
-#define _X264_H 1
+#ifndef X264_X264_H
+#define X264_X264_H
 
 #if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
     !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)
@@ -35,7 +35,7 @@
 
 #include <stdarg.h>
 
-#define X264_BUILD 57
+#define X264_BUILD 59
 
 /* x264_t:
  *      opaque handler for encoder */
@@ -55,9 +55,10 @@ typedef struct x264_t x264_t;
 #define X264_CPU_ALTIVEC    0x000040    /* altivec */
 #define X264_CPU_SSE3       0x000080    /* sse 3 */
 #define X264_CPU_SSSE3      0x000100    /* ssse 3 */
-#define X264_CPU_CACHELINE_SPLIT 0x200  /* avoid memory loads that span the boder between two cachelines */
+#define X264_CPU_CACHELINE_SPLIT 0x200  /* avoid memory loads that span the border between two cachelines */
 #define X264_CPU_CACHELINE_32 0x0400    /* size of a cacheline in bytes */
 #define X264_CPU_CACHELINE_64 0x0800
+#define X264_CPU_SSE4       0x001000    /* sse 4.1 */
 
 /* Analyse flags
  */
@@ -82,6 +83,9 @@ typedef struct x264_t x264_t;
 #define X264_RC_CQP                  0
 #define X264_RC_CRF                  1
 #define X264_RC_ABR                  2
+#define X264_AQ_NONE                 0
+#define X264_AQ_LOCAL                1
+#define X264_AQ_GLOBAL               2
 
 static const char * const x264_direct_pred_names[] = { "none", "spatial", "temporal", "auto", 0 };
 static const char * const x264_motion_est_names[] = { "dia", "hex", "umh", "esa", "tesa", 0 };
@@ -93,6 +97,7 @@ static const char * const x264_transfer_names[] = { "", "bt709", "undef", "", "b
 static const char * const x264_colmatrix_names[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", "YCgCo", 0 };
 
 /* Colorspace type
+ * legacy only; nothing other than I420 is really supported.
  */
 #define X264_CSP_MASK           0x00ff  /* */
 #define X264_CSP_NONE           0x0000  /* Invalid mode     */
@@ -206,6 +211,7 @@ typedef struct x264_param_t
     void        *p_log_private;
     int         i_log_level;
     int         b_visualize;
+    char        *psz_dump_yuv;  /* filename for reconstructed frames */
 
     /* Encoder analyser parameters */
     struct
@@ -259,6 +265,9 @@ typedef struct x264_param_t
         float       f_ip_factor;
         float       f_pb_factor;
 
+        int         i_aq_mode;      /* psy adaptive QP. (X264_AQ_*) */
+        float       f_aq_strength;
+
         /* 2pass */
         int         b_stat_write;   /* Enable stat writing in psz_stat_out */
         char        *psz_stat_out;