#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 27
+#define X264_BUILD 34
/* x264_t:
* opaque handler for decoder and encoder */
/* 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 */
#define X264_ME_HEX 1
#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
*/
{
/* CPU flags */
unsigned int cpu;
+ int i_threads; /* divide each frame into multiple slices, encode in parallel */
/* Video Properties */
int i_width;
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 );
/* 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_*) */
float f_qcompress; /* 0.0 => cbr, 1.0 => constant qp */
float f_qblur; /* temporally blur quants */
float f_complexity_blur; /* temporally blur complexity */
- int i_zones;
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 */