x264.h: issue an explicit warning when neither stdint.h nor inttypes.h

[x264] / x264.h

diff --git a/x264.h b/x264.h
index 9ca64971060b03ae2018e605a45a745260cafc4a..d8affed93b9ddab04ca3fd55e110160a6a3d3919 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -24,9 +24,14 @@
 #ifndef _X264_H
 #define _X264_H 1
 
+#if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
+    !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)
+#warning You must include stdint.h or inttypes.h before x264.h
+#endif
+
 #include <stdarg.h>
 
-#define X264_BUILD 24
+#define X264_BUILD 34
 
 /* x264_t:
  *      opaque handler for decoder and encoder */
@@ -48,6 +53,7 @@ typedef struct x264_t x264_t;
 /* Analyse flags
  */
 #define X264_ANALYSE_I4x4       0x0001  /* Analyse i4x4 */
+#define X264_ANALYSE_I8x8       0x0002  /* Analyse i8x8 (requires 8x8 transform) */
 #define X264_ANALYSE_PSUB16x16  0x0010  /* Analyse p16x8, p8x16 and p8x8 */
 #define X264_ANALYSE_PSUB8x8    0x0020  /* Analyse p8x4, p4x8, p4x4 */
 #define X264_ANALYSE_BSUB16x16  0x0100  /* Analyse b16x8, b8x16 and b8x8 */
@@ -56,7 +62,11 @@ typedef struct x264_t x264_t;
 #define X264_DIRECT_PRED_TEMPORAL    2
 #define X264_ME_DIA                  0
 #define X264_ME_HEX                  1
-#define X264_ME_ESA                  2
+#define X264_ME_UMH                  2
+#define X264_ME_ESA                  3
+#define X264_CQM_FLAT                0
+#define X264_CQM_JVT                 1
+#define X264_CQM_CUSTOM              2
 
 /* Colorspace type
  */
@@ -91,10 +101,19 @@ typedef struct x264_t x264_t;
 #define X264_LOG_INFO           2
 #define X264_LOG_DEBUG          3
 
+typedef struct
+{
+    int i_start, i_end;
+    int b_force_qp;
+    int i_qp;
+    float f_bitrate_factor;
+} x264_zone_t;
+
 typedef struct
 {
     /* CPU flags */
     unsigned int cpu;
+    int         i_threads;  /* divide each frame into multiple slices, encode in parallel */
 
     /* Video Properties */
     int         i_width;
@@ -111,7 +130,6 @@ typedef struct
 
     int         i_fps_num;
     int         i_fps_den;
-    int         i_maxframes;        /* Maximum number of frames to read from input file and encode, 0=unlimited */
 
     /* Bitstream parameters */
     int         i_frame_reference;  /* Maximum number of reference frames */
@@ -130,17 +148,28 @@ typedef struct
     int         b_cabac;
     int         i_cabac_init_idc;
 
+    int         i_cqm_preset;
+    char        *psz_cqm_file;      /* JM format */
+    int8_t      cqm_4iy[16];        /* used only if i_cqm_preset == X264_CQM_CUSTOM */
+    int8_t      cqm_4ic[16];
+    int8_t      cqm_4py[16];
+    int8_t      cqm_4pc[16];
+    int8_t      cqm_8iy[64];
+    int8_t      cqm_8py[64];
 
     /* Log */
     void        (*pf_log)( void *, int i_level, const char *psz, va_list );
     void        *p_log_private;
     int         i_log_level;
+    int         b_visualize;
 
     /* Encoder analyser parameters */
     struct
     {
-        unsigned int intra;     /* intra flags */
-        unsigned int inter;     /* inter flags */
+        unsigned int intra;     /* intra partitions */
+        unsigned int inter;     /* inter partitions */
+
+        int          b_transform_8x8;
 
         int          i_direct_mv_pred; /* spatial vs temporal mv prediction */
         int          i_me_method; /* motion estimation algorithm to use (X264_ME_*) */
@@ -179,11 +208,14 @@ typedef struct
         int         b_stat_read;    /* Read stat from psz_stat_in and use it */
         char        *psz_stat_in;
 
-        /* 2pass params (same than ffmpeg ones) */
+        /* 2pass params (same as ffmpeg ones) */
         char        *psz_rc_eq;     /* 2 pass rate control equation */
         float       f_qcompress;    /* 0.0 => cbr, 1.0 => constant qp */
         float       f_qblur;        /* temporally blur quants */
         float       f_complexity_blur; /* temporally blur complexity */
+        x264_zone_t *zones;         /* ratecontrol overrides */
+        int         i_zones;        /* sumber of zone_t's */
+        char        *psz_zones;     /* alternate method of specifying zones */
     } rc;
 
     int b_aud;                  /* generate access unit delimiters */
@@ -281,6 +313,10 @@ int x264_nal_decode( x264_nal_t *nal, void *, int );
 /* x264_encoder_open:
  *      create a new encoder handler, all parameters from x264_param_t are copied */
 x264_t *x264_encoder_open   ( x264_param_t * );
+/* x264_encoder_reconfig:
+ *      change encoder options while encoding,
+ *      analysis-related parameters from x264_param_t are copied */
+int     x264_encoder_reconfig( x264_t *, x264_param_t * );
 /* x264_encoder_headers:
  *      return the SPS and PPS that will be used for the whole stream */
 int     x264_encoder_headers( x264_t *, x264_nal_t **, int * );