X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcodec%2Fx264.c;h=97d4461b61ad9dd21bea3417a39a6037ecaea675;hb=c32f5ca08da07066106fd4e462e660fb68c8971c;hp=431937bb4628dbc927e4ee7bf61dacde1f8837e1;hpb=21ae55dcaa809e0f5e6b6e424a6ce2f77966ad19;p=vlc diff --git a/modules/codec/x264.c b/modules/codec/x264.c index 431937bb46..97d4461b61 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -75,7 +75,7 @@ static void Close( vlc_object_t * ); #define B_ADAPT_LONGTEXT N_( "Force the specified number of " \ "consecutive B-frames to be used, except possibly before an I-frame." ) -#define B_BIAS_TEXT N_("B-frames usage") +#define B_BIAS_TEXT N_("Influence (bias) B-frames usage") #define B_BIAS_LONGTEXT N_( "Bias the choice to use B-frames. Positive values " \ "cause more B-frames, negative values cause less B-frames." ) @@ -102,6 +102,20 @@ static void Close( vlc_object_t * ); #define FILTER_LONGTEXT N_( "Loop filter AlphaC0 and Beta parameters. " \ "Range -6 to 6 for both alpha and beta parameters. -6 means light " \ "filter, 6 means strong.") + +#define LEVEL_TEXT N_("H.264 level") +#define LEVEL_LONGTEXT N_( "Specify H.264 level (as defined by Annex A " \ + "of the standard). Levels are not enforced; it's up to the user to select " \ + "a level compatible with the rest of the encoding options. Range 1 to 5.1 " \ + "(10 to 51 is also allowed).") + +/* In order to play an interlaced output stream encoded by x264, a decoder needs + mbaff support. r570 is using the 'mb' part and not 'aff' yet; so it's really + 'pure-interlaced' mode */ +#if X264_BUILD >= 51 /* r570 */ +#define INTERLACED_TEXT N_("Interlaced mode") +#define INTERLACED_LONGTEXT N_( "Pure-interlaced mode.") +#endif /* Ratecontrol */ @@ -174,6 +188,14 @@ static void Close( vlc_object_t * ); #define DIRECT_PRED_TEXT N_("Direct MV prediction mode") #define DIRECT_PRED_LONGTEXT N_( "Direct MV prediction mode.") +#if X264_BUILD >= 52 /* r573 */ +#define DIRECT_PRED_SIZE_TEXT N_("Direct prediction size") +#define DIRECT_PRED_SIZE_LONGTEXT N_( "Direct prediction size: "\ + " - 0: 4x4\n" \ + " - 1: 8x8\n" \ + " - -1: smallest possible according to level\n" ) +#endif + #define WEIGHTB_TEXT N_("Weighted prediction for B-frames") #define WEIGHTB_LONGTEXT N_( "Weighted prediction for B-frames.") @@ -218,7 +240,7 @@ static void Close( vlc_object_t * ); "independently select a reference frame, as opposed to only one ref " \ "per macroblock." ) -#define CHROMA_ME_TEXT N_("Ignore chroma in motion estimation") +#define CHROMA_ME_TEXT N_("Chroma in motion estimation") #define CHROMA_ME_LONGTEXT N_( "Chroma ME for subpel and mode decision in " \ "P-frames.") @@ -248,6 +270,16 @@ static void Close( vlc_object_t * ); #define NR_LONGTEXT N_( "Dct-domain noise reduction. Adaptive pseudo-deadzone. " \ "10 to 1000 seems to be a useful range." ) +#if X264_BUILD >= 52 /* r573 */ +#define DEADZONE_INTER_TEXT N_("Inter luma quantization deadzone") +#define DEADZONE_INTER_LONGTEXT N_( "Set the size of the inter luma quantization deadzone. " \ + "Range 0 to 32." ) + +#define DEADZONE_INTRA_TEXT N_("Intra luma quantization deadzone") +#define DEADZONE_INTRA_LONGTEXT N_( "Set the size of the intra luma quantization deadzone. " \ + "Range 0 to 32." ) +#endif + /* Input/Output */ #define ASM_TEXT N_("CPU optimizations") @@ -267,29 +299,37 @@ static void Close( vlc_object_t * ); #define VERBOSE_TEXT N_("Statistics") #define VERBOSE_LONGTEXT N_( "Print stats for each frame.") +#if X264_BUILD >= 47 /* r518 */ +#define SPS_ID_TEXT N_("SPS and PPS id numbers") +#define SPS_ID_LONGTEXT N_( "Set SPS and PPS id numbers to allow concatenating " \ + "streams with different settings.") +#endif + +#define AUD_TEXT N_("Access unit delimiters") +#define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.") + #if X264_BUILD >= 24 static char *enc_me_list[] = - { "", "dia", "hex", "umh", "esa" }; + { "dia", "hex", "umh", "esa" }; static char *enc_me_list_text[] = - { N_("default"), N_("dia"), N_("hex"), N_("umh"), N_("esa") }; + { N_("dia"), N_("hex"), N_("umh"), N_("esa") }; #endif static char *enc_analyse_list[] = - { "", "none", "fast", "normal", "slow", "all" }; + { "none", "fast", "normal", "slow", "all" }; static char *enc_analyse_list_text[] = - { N_("default"), N_("none"), N_("fast"), N_("normal"), - N_("slow"), N_("all") }; + { N_("none"), N_("fast"), N_("normal"), N_("slow"), N_("all") }; #if X264_BUILD >= 45 /* r457 */ static char *direct_pred_list[] = - { "", "none", "spatial", "temporal", "auto" }; + { "none", "spatial", "temporal", "auto" }; static char *direct_pred_list_text[] = - { N_("default"), N_("none"), N_("spatial"), N_("temporal"), N_("auto") }; + { N_("none"), N_("spatial"), N_("temporal"), N_("auto") }; #else static char *direct_pred_list[] = - { "", "none", "spatial", "temporal" }; + { "none", "spatial", "temporal" }; static char *direct_pred_list_text[] = - { N_("default"), N_("none"), N_("spatial"), N_("temporal") }; + { N_("none"), N_("spatial"), N_("temporal") }; #endif vlc_module_begin(); @@ -333,15 +373,24 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "ref", 1, NULL, REF_TEXT, REF_LONGTEXT, VLC_FALSE ); - add_deprecated( SOUT_CFG_PREFIX "frameref", VLC_FALSE ); /* Deprecated since 0.8.5 */ change_integer_range( 1, 16 ); + add_deprecated( SOUT_CFG_PREFIX "frameref", VLC_FALSE ); /* Deprecated since 0.8.5 */ add_bool( SOUT_CFG_PREFIX "nf", 0, NULL, NF_TEXT, NF_LONGTEXT, VLC_FALSE ); add_deprecated( SOUT_CFG_PREFIX "loopfilter", VLC_FALSE ); /* Deprecated since 0.8.5 */ - add_string( SOUT_CFG_PREFIX "filter", "", NULL, FILTER_TEXT, + add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT, FILTER_LONGTEXT, VLC_FALSE ); + add_deprecated( SOUT_CFG_PREFIX "filter", VLC_FALSE ); /* Deprecated since 0.8.6 */ + + add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT, + LEVEL_LONGTEXT, VLC_FALSE ); + +#if X264_BUILD >= 51 /* r570 */ + add_bool( SOUT_CFG_PREFIX "interlaced", 0, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT, + VLC_FALSE ); +#endif /* Ratecontrol */ @@ -357,13 +406,13 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT, QPMIN_LONGTEXT, VLC_FALSE ); - add_deprecated( SOUT_CFG_PREFIX "qp-min", VLC_FALSE ); /* Deprecated since 0.8.5 */ change_integer_range( 0, 51 ); + add_deprecated( SOUT_CFG_PREFIX "qp-min", VLC_FALSE ); /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT, QPMAX_LONGTEXT, VLC_FALSE ); - add_deprecated( SOUT_CFG_PREFIX "qp-max", VLC_FALSE ); /* Deprecated since 0.8.5 */ change_integer_range( 0, 51 ); + add_deprecated( SOUT_CFG_PREFIX "qp-max", VLC_FALSE ); /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT, QPSTEP_LONGTEXT, VLC_FALSE ); @@ -371,8 +420,8 @@ vlc_module_begin(); add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT, RATETOL_LONGTEXT, VLC_FALSE ); - add_deprecated( SOUT_CFG_PREFIX "tolerance", VLC_FALSE ); /* Deprecated since 0.8.5 */ change_float_range( 0, 100 ); + add_deprecated( SOUT_CFG_PREFIX "tolerance", VLC_FALSE ); /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT, VBV_MAXRATE_LONGTEXT, VLC_FALSE ); @@ -409,15 +458,22 @@ vlc_module_begin(); /* Analysis */ - /* x264 analyse = none (default). set at least "normal" mode. */ - add_string( SOUT_CFG_PREFIX "analyse", "normal", NULL, ANALYSE_TEXT, + /* x264 partitions = none (default). set at least "normal" mode. */ + add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT, ANALYSE_LONGTEXT, VLC_FALSE ); change_string_list( enc_analyse_list, enc_analyse_list_text, 0 ); + add_deprecated( SOUT_CFG_PREFIX "analyse", VLC_FALSE ); /* Deprecated since 0.8.6 */ add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT, DIRECT_PRED_LONGTEXT, VLC_FALSE ); change_string_list( direct_pred_list, direct_pred_list_text, 0 ); +#if X264_BUILD >= 52 /* r573 */ + add_integer( SOUT_CFG_PREFIX "direct-8x8", 0, NULL, DIRECT_PRED_SIZE_TEXT, + DIRECT_PRED_SIZE_LONGTEXT, VLC_FALSE ); + change_integer_range( -1, 1 ); +#endif + #if X264_BUILD >= 0x0012 /* r134 */ add_bool( SOUT_CFG_PREFIX "weightb", 0, NULL, WEIGHTB_TEXT, WEIGHTB_LONGTEXT, VLC_FALSE ); @@ -435,8 +491,8 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT, SUBME_LONGTEXT, VLC_FALSE ); - add_deprecated( SOUT_CFG_PREFIX "subpel", VLC_FALSE ); /* Deprecated since 0.8.5 */ change_integer_range( 1, SUBME_MAX ); + add_deprecated( SOUT_CFG_PREFIX "subpel", VLC_FALSE ); /* Deprecated since 0.8.5 */ #if X264_BUILD >= 41 /* r368 */ add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT, @@ -485,10 +541,25 @@ vlc_module_begin(); change_integer_range( 0, 1000 ); #endif +#if X264_BUILD >= 52 /* r573 */ + add_integer( SOUT_CFG_PREFIX "deadzone-inter", 21, NULL, DEADZONE_INTER_TEXT, + DEADZONE_INTRA_LONGTEXT, VLC_FALSE ); + change_integer_range( 0, 32 ); + + add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, NULL, DEADZONE_INTRA_TEXT, + DEADZONE_INTRA_LONGTEXT, VLC_FALSE ); + change_integer_range( 0, 32 ); +#endif + /* Input/Output */ +#if defined(__DARWIN__) && defined(__INTEL__) + add_bool( SOUT_CFG_PREFIX "asm", 0, NULL, ASM_TEXT, + ASM_LONGTEXT, VLC_FALSE ); +#else add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT, ASM_LONGTEXT, VLC_FALSE ); +#endif /* x264 psnr = 1 (default). disable PSNR computation for speed. */ add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT, @@ -503,6 +574,14 @@ vlc_module_begin(); add_bool( SOUT_CFG_PREFIX "quiet", 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_FALSE ); +#if X264_BUILD >= 47 /* r518 */ + add_integer( SOUT_CFG_PREFIX "sps-id", 0, NULL, SPS_ID_TEXT, + SPS_ID_LONGTEXT, VLC_FALSE ); +#endif + + add_bool( SOUT_CFG_PREFIX "aud", 0, NULL, AUD_TEXT, + AUD_LONGTEXT, VLC_FALSE ); + #if X264_BUILD >= 0x000e /* r81 */ add_bool( SOUT_CFG_PREFIX "verbose", 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT, VLC_FALSE ); @@ -514,15 +593,16 @@ vlc_module_end(); * Local prototypes *****************************************************************************/ static const char *ppsz_sout_options[] = { - "8x8dct", "analyse", "asm", "bframes", "bime", "bpyramid", "b-adapt", - "b-bias", "b-rdo", "cabac", "chroma-me", "chroma-qp-offset", "cplxblur", - "crf", "dct-decimate", "direct", "filter", "fast-pskip", "frameref", - "ipratio", "keyint", "keyint-min", "loopfilter", "me", "merange", - "min-keyint", "mixed-refs", "nf", "nr", "pbratio", "psnr", "qblur", - "qp", "qcomp", "qpstep", "qpmax", "qpmin", "qp-max", "qp-min", "quiet", - "ratetol", "ref", "scenecut", "ssim", "subme", "subpel", "tolerance", - "trellis", "verbose", "vbv-bufsize", "vbv-init", "vbv-maxrate", - "weightb", NULL + "8x8dct", "analyse", "asm", "aud", "bframes", "bime", "bpyramid", + "b-adapt", "b-bias", "b-rdo", "cabac", "chroma-me", "chroma-qp-offset", + "cplxblur", "crf", "dct-decimate", "deadzone-inter", "deadzone-intra", + "deblock", "direct", "direct-8x8", "filter", "fast-pskip", "frameref", + "interlaced", "ipratio", "keyint", "keyint-min", "level", "loopfilter", + "me", "merange", "min-keyint", "mixed-refs", "nf", "nr", "partitions", + "pbratio", "psnr", "qblur", "qp", "qcomp", "qpstep", "qpmax", "qpmin", + "qp-max", "qp-min", "quiet", "ratetol", "ref", "scenecut", "sps-id", + "ssim", "subme", "subpel", "tolerance", "trellis", "verbose", + "vbv-bufsize", "vbv-init", "vbv-maxrate", "weightb", NULL }; static block_t *Encode( encoder_t *, picture_t * ); @@ -558,7 +638,7 @@ static int Open ( vlc_object_t *p_this ) #if X264_BUILD < 37 if( p_enc->fmt_in.video.i_width % 16 != 0 || - p_enc->fmt_in.video.i_height % 16!= 0 ) + p_enc->fmt_in.video.i_height % 16 != 0 ) { msg_Warn( p_enc, "size is not a multiple of 16 (%ix%i)", p_enc->fmt_in.video.i_width, p_enc->fmt_in.video.i_height ); @@ -576,7 +656,7 @@ static int Open ( vlc_object_t *p_this ) } #endif - sout_CfgParse( p_enc, SOUT_CFG_PREFIX, ppsz_sout_options, p_enc->p_cfg ); + config_ChainParse( p_enc, SOUT_CFG_PREFIX, ppsz_sout_options, p_enc->p_cfg ); p_enc->fmt_out.i_codec = VLC_FOURCC( 'h', '2', '6', '4' ); p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0'); @@ -659,7 +739,7 @@ static int Open ( vlc_object_t *p_this ) var_Get( p_enc, SOUT_CFG_PREFIX "nf", &val ); p_sys->param.b_deblocking_filter = !val.b_bool; - var_Get( p_enc, SOUT_CFG_PREFIX "filter", &val ); + var_Get( p_enc, SOUT_CFG_PREFIX "deblock", &val ); if( val.psz_string ) { char *p = strchr( val.psz_string, ':' ); @@ -668,6 +748,21 @@ static int Open ( vlc_object_t *p_this ) free( val.psz_string ); } + var_Get( p_enc, SOUT_CFG_PREFIX "level", &val ); + if( val.psz_string ) + { + if( atof (val.psz_string) < 6 ) + p_sys->param.i_level_idc = (int) ( 10 * atof (val.psz_string) + .5); + else + p_sys->param.i_level_idc = atoi (val.psz_string); + free( val.psz_string ); + } + +#if X264_BUILD >= 51 /* r570 */ + var_Get( p_enc, SOUT_CFG_PREFIX "interlaced", &val ); + p_sys->param.b_interlaced = val.b_bool; +#endif + var_Get( p_enc, SOUT_CFG_PREFIX "ipratio", &val ); p_sys->param.rc.f_ip_factor = val.f_float; @@ -691,6 +786,14 @@ static int Open ( vlc_object_t *p_this ) var_Get( p_enc, SOUT_CFG_PREFIX "quiet", &val ); if( val.b_bool ) p_sys->param.i_log_level = X264_LOG_NONE; +#if X264_BUILD >= 47 /* r518 */ + var_Get( p_enc, SOUT_CFG_PREFIX "sps-id", &val ); + if( val.i_int >= 0 ) p_sys->param.i_sps_id = val.i_int; +#endif + + var_Get( p_enc, SOUT_CFG_PREFIX "aud", &val ); + if( val.b_bool ) p_sys->param.b_aud = val.b_bool; + var_Get( p_enc, SOUT_CFG_PREFIX "keyint", &val ); #if X264_BUILD >= 0x000e if( val.i_int > 0 ) p_sys->param.i_keyint_max = val.i_int; @@ -812,7 +915,11 @@ static int Open ( vlc_object_t *p_this ) var_Get( p_enc, SOUT_CFG_PREFIX "crf", &val ); if( val.i_int > 0 && val.i_int <= 51 ) { +#if X264_BUILD >= 54 + p_sys->param.rc.f_rf_constant = val.i_int; +#else p_sys->param.rc.i_rf_constant = val.i_int; +#endif #if X264_BUILD >= 48 p_sys->param.rc.i_rc_method = X264_RC_CRF; #endif @@ -851,13 +958,27 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.analyse.b_dct_decimate = val.b_bool; #endif +#if X264_BUILD >= 52 + var_Get( p_enc, SOUT_CFG_PREFIX "deadzone-inter", &val ); + if( val.i_int >= 0 && val.i_int <= 32 ) + p_sys->param.analyse.i_luma_deadzone[0] = val.i_int; + + var_Get( p_enc, SOUT_CFG_PREFIX "deadzone-intra", &val ); + if( val.i_int >= 0 && val.i_int <= 32 ) + p_sys->param.analyse.i_luma_deadzone[1] = val.i_int; + + var_Get( p_enc, SOUT_CFG_PREFIX "direct-8x8", &val ); + if( val.i_int >= -1 && val.i_int <= 1 ) + p_sys->param.analyse.i_direct_8x8_inference = val.i_int; +#endif + var_Get( p_enc, SOUT_CFG_PREFIX "asm", &val ); if( !val.b_bool ) p_sys->param.cpu = 0; #ifndef X264_ANALYSE_BSUB16x16 # define X264_ANALYSE_BSUB16x16 0 #endif - var_Get( p_enc, SOUT_CFG_PREFIX "analyse", &val ); + var_Get( p_enc, SOUT_CFG_PREFIX "partitions", &val ); if( !strcmp( val.psz_string, "none" ) ) { p_sys->param.analyse.inter = 0; @@ -906,7 +1027,7 @@ static int Open ( vlc_object_t *p_this ) if( p_enc->fmt_in.video.i_aspect > 0 ) { int64_t i_num, i_den; - int i_dst_num, i_dst_den; + unsigned int i_dst_num, i_dst_den; i_num = p_enc->fmt_in.video.i_aspect * (int64_t)p_enc->fmt_in.video.i_height; @@ -921,19 +1042,19 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.i_fps_num = p_enc->fmt_in.video.i_frame_rate; p_sys->param.i_fps_den = p_enc->fmt_in.video.i_frame_rate_base; } - if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) ) + if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) ) { p_sys->param.cpu &= ~X264_CPU_MMX; } - if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) ) + if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) ) { p_sys->param.cpu &= ~X264_CPU_MMXEXT; } - if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) ) + if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) ) { p_sys->param.cpu &= ~X264_CPU_SSE; } - if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) ) + if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2) ) { p_sys->param.cpu &= ~X264_CPU_SSE2; }