#include <stdarg.h>
-#define X264_BUILD 54
+#define X264_BUILD 59
/* x264_t:
* opaque handler for encoder */
#define X264_CPU_3DNOW 0x000010 /* 3dnow! */
#define X264_CPU_3DNOWEXT 0x000020 /* 3dnow! ext */
#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_32 0x0400 /* size of a cacheline in bytes */
+#define X264_CPU_CACHELINE_64 0x0800
/* Analyse flags
*/
#define X264_ME_HEX 1
#define X264_ME_UMH 2
#define X264_ME_ESA 3
+#define X264_ME_TESA 4
#define X264_CQM_FLAT 0
#define X264_CQM_JVT 1
#define X264_CQM_CUSTOM 2
-
+#define X264_RC_NONE -1
#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", 0 };
+static const char * const x264_motion_est_names[] = { "dia", "hex", "umh", "esa", "tesa", 0 };
static const char * const x264_overscan_names[] = { "undef", "show", "crop", 0 };
static const char * const x264_vidformat_names[] = { "component", "pal", "ntsc", "secam", "mac", "undef", 0 };
static const char * const x264_fullrange_names[] = { "off", "on", 0 };
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 */
#define X264_LOG_INFO 2
#define X264_LOG_DEBUG 3
+/* Zones: override ratecontrol or other options for specific sections of the video.
+ * See x264_encoder_reconfig() for which options can be changed.
+ * If zones overlap, whichever comes later in the list takes precedence. */
typedef struct
{
- int i_start, i_end;
- int b_force_qp;
+ int i_start, i_end; /* range of frame numbers */
+ int b_force_qp; /* whether to use qp vs bitrate factor */
int i_qp;
float f_bitrate_factor;
+ struct x264_param_t *param;
} x264_zone_t;
-typedef struct
+typedef struct x264_param_t
{
/* CPU flags */
unsigned int cpu;
- int i_threads; /* divide each frame into multiple slices, encode in parallel */
+ int i_threads; /* encode multiple frames in parallel */
+ int b_deterministic; /* whether to allow non-deterministic optimizations when threaded */
/* Video Properties */
int i_width;
int i_keyint_max; /* Force an IDR keyframe at this interval */
int i_keyint_min; /* Scenecuts closer together than this are coded as I, not IDR. */
int i_scenecut_threshold; /* how aggressively to insert extra I frames */
+ int b_pre_scenecut; /* compute scenecut on lowres frames */
int i_bframe; /* how many b-frame between 2 references pictures */
int b_bframe_adaptive;
int i_bframe_bias;
int i_me_method; /* motion estimation algorithm to use (X264_ME_*) */
int i_me_range; /* integer pixel motion estimation search range (from predicted mv) */
int i_mv_range; /* maximum length of a mv (in pixels). -1 = auto, based on level */
+ int i_mv_range_thread; /* minimum space between threads. -1 = auto, based on number of threads. */
int i_subpel_refine; /* subpixel motion estimation quality */
int b_bidir_me; /* jointly optimize both MVs in B-frames */
int b_chroma_me; /* chroma ME for subpel and mode decision in P-frames */
int i_noise_reduction; /* adaptive pseudo-deadzone */
/* the deadzone size that will be used in luma quantization */
- int i_luma_deadzone[2]; // {inter, intra}
+ int i_luma_deadzone[2]; /* {inter, intra} */
int b_psnr; /* compute and print PSNR stats */
int b_ssim; /* compute and print SSIM stats */
float f_rate_tolerance;
int i_vbv_max_bitrate;
int i_vbv_buffer_size;
- float f_vbv_buffer_init;
+ float f_vbv_buffer_init; /* <=1: fraction of buffer_size. >1: kbit */
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;
typedef struct {
int level_idc;
- int mbps; // max macroblock processing rate (macroblocks/sec)
- int frame_size; // max frame size (macroblocks)
- int dpb; // max decoded picture buffer (bytes)
- int bitrate; // max bitrate (kbit/sec)
- int cpb; // max vbv buffer (kbit)
- int mv_range; // max vertical mv component range (pixels)
- int mvs_per_2mb; // max mvs per 2 consecutive mbs.
- int slice_rate; // ??
- int bipred8x8; // limit bipred to >=8x8
- int direct8x8; // limit b_direct to >=8x8
- int frame_only; // forbid interlacing
+ int mbps; /* max macroblock processing rate (macroblocks/sec) */
+ int frame_size; /* max frame size (macroblocks) */
+ int dpb; /* max decoded picture buffer (bytes) */
+ int bitrate; /* max bitrate (kbit/sec) */
+ int cpb; /* max vbv buffer (kbit) */
+ int mv_range; /* max vertical mv component range (pixels) */
+ int mvs_per_2mb; /* max mvs per 2 consecutive mbs. */
+ int slice_rate; /* ?? */
+ int bipred8x8; /* limit bipred to >=8x8 */
+ int direct8x8; /* limit b_direct to >=8x8 */
+ int frame_only; /* forbid interlacing */
} x264_level_t;
/* all of the levels defined in the standard, terminated by .level_idc=0 */
* close an encoder handler */
void x264_encoder_close ( x264_t * );
-/****************************************************************************
- * Private stuff for internal usage:
- ****************************************************************************/
-#ifdef __X264__
-# ifdef _MSC_VER
-# define inline __inline
-# define DECLARE_ALIGNED( type, var, n ) __declspec(align(n)) type var
-# define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
-# else
-# define DECLARE_ALIGNED( type, var, n ) type var __attribute__((aligned(n)))
-# endif
-#endif
-
#endif
projects / x264 / blobdiff