X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=x264.h;h=323f9bbc4376f9edaf622a3e74d532073d36aebf;hb=1bf7228f7e975e9220daae5a439797aaea2aa511;hp=491393f9a6570ac35f1b9ba23c4944d2085b51bf;hpb=93b54ce1fbbbb191e69d8c6e33897037ba5bbfd1;p=x264 diff --git a/x264.h b/x264.h index 491393f9..323f9bbc 100644 --- a/x264.h +++ b/x264.h @@ -1,10 +1,10 @@ /***************************************************************************** * x264.h: h264 encoder library ***************************************************************************** - * Copyright (C) 2003 Laurent Aimar - * $Id: x264.h,v 1.1 2004/06/03 19:24:12 fenrir Exp $ + * Copyright (C) 2003-2008 x264 Project * * Authors: Laurent Aimar + * Loren Merritt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, 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 -#define X264_BUILD 54 +#define X264_BUILD 65 /* x264_t: * opaque handler for encoder */ @@ -46,13 +46,21 @@ typedef struct x264_t x264_t; ****************************************************************************/ /* CPU flags */ -#define X264_CPU_MMX 0x000001 /* mmx */ -#define X264_CPU_MMXEXT 0x000002 /* mmx-ext*/ -#define X264_CPU_SSE 0x000004 /* sse */ -#define X264_CPU_SSE2 0x000008 /* sse 2 */ -#define X264_CPU_3DNOW 0x000010 /* 3dnow! */ -#define X264_CPU_3DNOWEXT 0x000020 /* 3dnow! ext */ -#define X264_CPU_ALTIVEC 0x000040 /* altivec */ +#define X264_CPU_CACHELINE_32 0x000001 /* avoid memory loads that span the border between two cachelines */ +#define X264_CPU_CACHELINE_64 0x000002 /* 32/64 is the size of a cacheline in bytes */ +#define X264_CPU_ALTIVEC 0x000004 +#define X264_CPU_MMX 0x000008 +#define X264_CPU_MMXEXT 0x000010 /* MMX2 aka MMXEXT aka ISSE */ +#define X264_CPU_SSE 0x000020 +#define X264_CPU_SSE2 0x000040 +#define X264_CPU_SSE2_IS_SLOW 0x000080 /* avoid most SSE2 functions on Athlon64 */ +#define X264_CPU_SSE2_IS_FAST 0x000100 /* a few functions are only faster on Core2 and Phenom */ +#define X264_CPU_SSE3 0x000200 +#define X264_CPU_SSSE3 0x000400 +#define X264_CPU_PHADD_IS_FAST 0x000800 /* pre-Penryn Core2 have a uselessly slow PHADD instruction */ +#define X264_CPU_STACK_MOD4 0x001000 /* if stack is only mod4 and not mod16 */ +#define X264_CPU_SSE4 0x002000 /* SSE4.1 */ +#define X264_CPU_SSE42 0x004000 /* SSE4.2 */ /* Analyse flags */ @@ -69,16 +77,22 @@ typedef struct x264_t x264_t; #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_VARIANCE 1 +#define X264_B_ADAPT_NONE 0 +#define X264_B_ADAPT_FAST 1 +#define X264_B_ADAPT_TRELLIS 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 }; @@ -87,6 +101,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 */ @@ -120,25 +135,30 @@ static const char * const x264_colmatrix_names[] = { "GBR", "bt709", "undef", "" #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_height; int i_csp; /* CSP of encoded bitstream, only i420 supported */ - int i_level_idc; + int i_level_idc; int i_frame_total; /* number of frames to encode if known, else 0 */ struct @@ -148,7 +168,7 @@ typedef struct int i_sar_width; int i_overscan; /* 0=undef, 1=no overscan, 2=overscan */ - + /* see h264 annex E for the values of the following */ int i_vidformat; int b_fullrange; @@ -166,8 +186,9 @@ typedef struct 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_adaptive; int i_bframe_bias; int b_bframe_pyramid; /* Keep some B-frames as references */ @@ -194,6 +215,7 @@ typedef struct void *p_log_private; int i_log_level; int b_visualize; + char *psz_dump_yuv; /* filename for reconstructed frames */ /* Encoder analyser parameters */ struct @@ -210,18 +232,19 @@ typedef struct 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 b_bframe_rdo; /* RD based mode decision for B-frames */ int b_mixed_references; /* allow each mb partition in P-frames to have it's own reference number */ int i_trellis; /* trellis RD quantization */ int b_fast_pskip; /* early SKIP detection on P-frames */ int b_dct_decimate; /* transform coefficient thresholding on P-frames */ int i_noise_reduction; /* adaptive pseudo-deadzone */ + float f_psy_rd; /* Psy RD strength */ + float f_psy_trellis; /* Psy trellis strength */ /* 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 */ @@ -242,10 +265,13 @@ typedef struct 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; @@ -253,7 +279,6 @@ typedef struct char *psz_stat_in; /* 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 */ @@ -270,17 +295,17 @@ typedef struct 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 */ @@ -403,17 +428,4 @@ int x264_encoder_encode ( x264_t *, x264_nal_t **, int *, x264_picture_t *, * 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