X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=x264.h;h=e49f1a4cc2d3d6d381303f9ab505702a3a316447;hb=bdfec13d6ac6e70f9a01b1a36b1398b800c58e0f;hp=1de65f7f0610e3745a70b36bc630fcc57fa465b7;hpb=38fcbfbeb53d402f9431f18709aee37987dcf318;p=x264 diff --git a/x264.h b/x264.h index 1de65f7f..e49f1a4c 100644 --- a/x264.h +++ b/x264.h @@ -35,10 +35,10 @@ #include -#define X264_BUILD 42 +#define X264_BUILD 59 /* x264_t: - * opaque handler for decoder and encoder */ + * opaque handler for encoder */ typedef struct x264_t x264_t; /**************************************************************************** @@ -53,6 +53,11 @@ typedef struct x264_t x264_t; #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 */ @@ -64,18 +69,34 @@ typedef struct x264_t x264_t; #define X264_DIRECT_PRED_NONE 0 #define X264_DIRECT_PRED_SPATIAL 1 #define X264_DIRECT_PRED_TEMPORAL 2 +#define X264_DIRECT_PRED_AUTO 3 #define X264_ME_DIA 0 #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 - -static const char * const x264_direct_pred_names[] = { "none", "spatial", "temporal", 0 }; -static const char * const x264_motion_est_names[] = { "dia", "hex", "umh", "esa", 0 }; +#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", "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_colorprim_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", 0 }; +static const char * const x264_transfer_names[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316", 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 */ @@ -87,6 +108,7 @@ static const char * const x264_motion_est_names[] = { "dia", "hex", "umh", "esa" #define X264_CSP_RGB 0x0006 /* rgb 24bits */ #define X264_CSP_BGR 0x0007 /* bgr 24bits */ #define X264_CSP_BGRA 0x0008 /* bgr 32bits */ +#define X264_CSP_MAX 0x0009 /* end of list */ #define X264_CSP_VFLIP 0x1000 /* */ /* Slice type @@ -108,19 +130,24 @@ static const char * const x264_motion_est_names[] = { "dia", "hex", "umh", "esa" #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; @@ -154,6 +181,7 @@ 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_bias; @@ -166,6 +194,8 @@ typedef struct int b_cabac; int i_cabac_init_idc; + int b_interlaced; + int i_cqm_preset; char *psz_cqm_file; /* JM format */ uint8_t cqm_4iy[16]; /* used only if i_cqm_preset == X264_CQM_CUSTOM */ @@ -190,39 +220,52 @@ typedef struct int b_transform_8x8; int b_weighted_bipred; /* implicit weighting for B-frames */ int i_direct_mv_pred; /* spatial vs temporal mv prediction */ + int i_direct_8x8_inference; /* forbid 4x4 direct partitions. -1 = auto, based on level */ int i_chroma_qp_offset; 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) */ + 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 */ - int b_psnr; /* Do we compute PSNR stats (save a few % of cpu) */ + /* the deadzone size that will be used in luma quantization */ + int i_luma_deadzone[2]; /* {inter, intra} */ + + int b_psnr; /* compute and print PSNR stats */ + int b_ssim; /* compute and print SSIM stats */ } analyse; /* Rate control parameters */ struct { + int i_rc_method; /* X264_RC_* */ + int i_qp_constant; /* 0-51 */ int i_qp_min; /* min allowed QP value */ int i_qp_max; /* max allowed QP value */ int i_qp_step; /* max QP step between frames */ - int b_cbr; /* use bitrate instead of CQP */ int i_bitrate; - int i_rf_constant; /* 1pass VBR, nominal QP */ + float f_rf_constant; /* 1pass VBR, nominal QP */ 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; @@ -235,27 +278,29 @@ typedef struct 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 */ + int i_zones; /* number of zone_t's */ char *psz_zones; /* alternate method of specifying zones */ } rc; + /* Muxing parameters */ int b_aud; /* generate access unit delimiters */ int b_repeat_headers; /* put SPS/PPS before each keyframe */ + int i_sps_id; /* SPS and PPS id number */ } x264_param_t; 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 */ @@ -265,6 +310,17 @@ extern const x264_level_t x264_levels[]; * fill x264_param_t with default values and do CPU detection */ void x264_param_default( x264_param_t * ); +/* x264_param_parse: + * set one parameter by name. + * returns 0 on success, or returns one of the following errors. + * note: BAD_VALUE occurs only if it can't even parse the value, + * numerical range is not checked until x264_encoder_open() or + * x264_encoder_reconfig(). + * value=NULL means "true" for boolean options, but is a BAD_VALUE for non-booleans. */ +#define X264_PARAM_BAD_NAME (-1) +#define X264_PARAM_BAD_VALUE (-2) +int x264_param_parse( x264_param_t *, const char *name, const char *value ); + /**************************************************************************** * Picture structures and functions. ****************************************************************************/ @@ -367,19 +423,4 @@ int x264_encoder_encode ( x264_t *, x264_nal_t **, int *, x264_picture_t *, * close an encoder handler */ void x264_encoder_close ( x264_t * ); -/* XXX: decoder isn't working so no need to export it */ - -/**************************************************************************** - * 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