X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fx264.c;h=5ff5c10c82a4a61a4bef6dd42f885aceb91200f4;hb=7ca4e3eb624251feb1f97cfc25104cce473e04a0;hp=c009e2fe3e47becd35e4f25c3166f4efe2fac366;hpb=b7a979cdd5ff7de203a53f6a95b4a9aaa092c49a;p=vlc diff --git a/modules/codec/x264.c b/modules/codec/x264.c index c009e2fe3e..5ff5c10c82 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -28,7 +28,8 @@ # include "config.h" #endif -#include +#include +#include #include #include #include @@ -165,6 +166,20 @@ static void Close( vlc_object_t * ); #define VBV_INIT_LONGTEXT N_( "Sets the initial buffer occupancy as a " \ "fraction of the buffer size. Range 0.0 to 1.0.") +#if X264_BUILD >= 59 +#define AQ_MODE_TEXT N_("How AQ distributes bits") +#define AQ_MODE_LONGTEXT N_("Defines bitdistribution mode for AQ, default 2\n" \ + " - 0: Disabled\n"\ + " - 1: Avoid moving bits between frames\n"\ + " - 2: Move bits between frames") + +#define AQ_STRENGTH_TEXT N_("Strength of AQ") +#define AQ_STRENGTH_LONGTEXT N_("Strength to reduce blocking and blurring in flat\n"\ + "and textured areas, default 1.0 recommented to be between 0..2\n"\ + " - 0.5: weak AQ\n"\ + " - 1.5: strong AQ") +#endif + /* IP Ratio < 1 is technically valid but should never improve quality */ #define IPRATIO_TEXT N_("QP factor between I and P") #define IPRATIO_LONGTEXT N_( "QP factor between I and P. Range 1.0 to 2.0.") @@ -358,38 +373,38 @@ static void Close( vlc_object_t * ); #define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.") #if X264_BUILD >= 24 && X264_BUILD < 58 -static const char *enc_me_list[] = +static const char *const enc_me_list[] = { "dia", "hex", "umh", "esa" }; -static const char *enc_me_list_text[] = +static const char *const enc_me_list_text[] = { N_("dia"), N_("hex"), N_("umh"), N_("esa") }; #endif #if X264_BUILD >= 58 /* r728 */ -static const char *enc_me_list[] = +static const char *const enc_me_list[] = { "dia", "hex", "umh", "esa", "tesa" }; -static const char *enc_me_list_text[] = +static const char *const enc_me_list_text[] = { N_("dia"), N_("hex"), N_("umh"), N_("esa"), N_("tesa") }; #endif -static const char *enc_analyse_list[] = +static const char *const enc_analyse_list[] = { "none", "fast", "normal", "slow", "all" }; -static const char *enc_analyse_list_text[] = +static const char *const enc_analyse_list_text[] = { N_("none"), N_("fast"), N_("normal"), N_("slow"), N_("all") }; #if X264_BUILD >= 45 /* r457 */ -static const char *direct_pred_list[] = +static const char *const direct_pred_list[] = { "none", "spatial", "temporal", "auto" }; -static const char *direct_pred_list_text[] = +static const char *const direct_pred_list_text[] = { N_("none"), N_("spatial"), N_("temporal"), N_("auto") }; #else -static const char *direct_pred_list[] = +static const char *const direct_pred_list[] = { "none", "spatial", "temporal" }; -static const char *direct_pred_list_text[] = +static const char *const direct_pred_list_text[] = { N_("none"), N_("spatial"), N_("temporal") }; #endif vlc_module_begin(); - set_description( _("H.264/MPEG4 AVC encoder (using x264 library)")); + set_description( N_("H.264/MPEG4 AVC encoder (using x264 library)")); set_capability( "encoder", 200 ); set_callbacks( Open, Close ); set_category( CAT_INPUT ); @@ -398,229 +413,236 @@ vlc_module_begin(); /* Frame-type options */ add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT, - KEYINT_LONGTEXT, VLC_FALSE ); + KEYINT_LONGTEXT, false ); add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT, - MIN_KEYINT_LONGTEXT, VLC_FALSE ); + MIN_KEYINT_LONGTEXT, false ); add_deprecated_alias( SOUT_CFG_PREFIX "keyint-min" ); /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT, - SCENE_LONGTEXT, VLC_FALSE ); + SCENE_LONGTEXT, false ); change_integer_range( -1, 100 ); #if X264_BUILD >= 55 /* r607 */ add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT, - PRESCENE_LONGTEXT, VLC_FALSE ); + PRESCENE_LONGTEXT, false ); #endif add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT, - BFRAMES_LONGTEXT, VLC_FALSE ); + BFRAMES_LONGTEXT, false ); change_integer_range( 0, 16 ); #if X264_BUILD >= 0x0013 /* r137 */ add_bool( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT, - B_ADAPT_LONGTEXT, VLC_FALSE ); + B_ADAPT_LONGTEXT, false ); add_integer( SOUT_CFG_PREFIX "b-bias", 0, NULL, B_BIAS_TEXT, - B_BIAS_LONGTEXT, VLC_FALSE ); + B_BIAS_LONGTEXT, false ); change_integer_range( -100, 100 ); #endif add_bool( SOUT_CFG_PREFIX "bpyramid", 0, NULL, BPYRAMID_TEXT, - BPYRAMID_LONGTEXT, VLC_FALSE ); + BPYRAMID_LONGTEXT, false ); add_bool( SOUT_CFG_PREFIX "cabac", 1, NULL, CABAC_TEXT, CABAC_LONGTEXT, - VLC_FALSE ); + false ); add_integer( SOUT_CFG_PREFIX "ref", 1, NULL, REF_TEXT, - REF_LONGTEXT, VLC_FALSE ); + REF_LONGTEXT, false ); change_integer_range( 1, 16 ); add_deprecated_alias( SOUT_CFG_PREFIX "frameref" ); /* Deprecated since 0.8.5 */ add_bool( SOUT_CFG_PREFIX "nf", 0, NULL, NF_TEXT, - NF_LONGTEXT, VLC_FALSE ); + NF_LONGTEXT, false ); add_deprecated_alias( SOUT_CFG_PREFIX "loopfilter" ); /* Deprecated since 0.8.5 */ add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT, - FILTER_LONGTEXT, VLC_FALSE ); + FILTER_LONGTEXT, false ); add_deprecated_alias( SOUT_CFG_PREFIX "filter" ); /* Deprecated since 0.8.6 */ add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT, - LEVEL_LONGTEXT, VLC_FALSE ); + LEVEL_LONGTEXT, false ); #if X264_BUILD >= 51 /* r570 */ add_bool( SOUT_CFG_PREFIX "interlaced", 0, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT, - VLC_FALSE ); + false ); #endif /* Ratecontrol */ add_integer( SOUT_CFG_PREFIX "qp", 26, NULL, QP_TEXT, QP_LONGTEXT, - VLC_FALSE ); + false ); change_integer_range( 0, 51 ); /* QP 0 -> lossless encoding */ #if X264_BUILD >= 37 /* r334 */ add_integer( SOUT_CFG_PREFIX "crf", 0, NULL, CRF_TEXT, - CRF_LONGTEXT, VLC_FALSE ); + CRF_LONGTEXT, false ); change_integer_range( 0, 51 ); #endif add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT, - QPMIN_LONGTEXT, VLC_FALSE ); + QPMIN_LONGTEXT, false ); change_integer_range( 0, 51 ); add_deprecated_alias( SOUT_CFG_PREFIX "qp-min" ); /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT, - QPMAX_LONGTEXT, VLC_FALSE ); + QPMAX_LONGTEXT, false ); change_integer_range( 0, 51 ); add_deprecated_alias( SOUT_CFG_PREFIX "qp-max" ); /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT, - QPSTEP_LONGTEXT, VLC_FALSE ); + QPSTEP_LONGTEXT, false ); change_integer_range( 0, 51 ); add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT, - RATETOL_LONGTEXT, VLC_FALSE ); + RATETOL_LONGTEXT, false ); change_float_range( 0, 100 ); add_deprecated_alias( SOUT_CFG_PREFIX "tolerance" ); /* Deprecated since 0.8.5 */ add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT, - VBV_MAXRATE_LONGTEXT, VLC_FALSE ); + VBV_MAXRATE_LONGTEXT, false ); add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, NULL, VBV_BUFSIZE_TEXT, - VBV_BUFSIZE_LONGTEXT, VLC_FALSE ); + VBV_BUFSIZE_LONGTEXT, false ); add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT, - VBV_INIT_LONGTEXT, VLC_FALSE ); + VBV_INIT_LONGTEXT, false ); change_float_range( 0, 1 ); add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT, - IPRATIO_LONGTEXT, VLC_FALSE ); + IPRATIO_LONGTEXT, false ); change_float_range( 1, 2 ); add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT, - PBRATIO_LONGTEXT, VLC_FALSE ); + PBRATIO_LONGTEXT, false ); change_float_range( 1, 2 ); #if X264_BUILD >= 23 /* r190 */ add_integer( SOUT_CFG_PREFIX "chroma-qp-offset", 0, NULL, CHROMA_QP_OFFSET_TEXT, - CHROMA_QP_OFFSET_LONGTEXT, VLC_FALSE ); + CHROMA_QP_OFFSET_LONGTEXT, false ); #endif add_integer( SOUT_CFG_PREFIX "pass", 0, NULL, PASS_TEXT, - PASS_LONGTEXT, VLC_FALSE ); + PASS_LONGTEXT, false ); change_integer_range( 0, 3 ); add_float( SOUT_CFG_PREFIX "qcomp", 0.60, NULL, QCOMP_TEXT, - QCOMP_LONGTEXT, VLC_FALSE ); + QCOMP_LONGTEXT, false ); change_float_range( 0, 1 ); add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, NULL, CPLXBLUR_TEXT, - CPLXBLUR_LONGTEXT, VLC_FALSE ); + CPLXBLUR_LONGTEXT, false ); add_float( SOUT_CFG_PREFIX "qblur", 0.5, NULL, QBLUR_TEXT, - QBLUR_LONGTEXT, VLC_FALSE ); + QBLUR_LONGTEXT, false ); +#if X264_BUILD >= 59 + add_integer( SOUT_CFG_PREFIX "aq-mode", 2, NULL, AQ_MODE_TEXT, + AQ_MODE_LONGTEXT, false ); + change_integer_range( 0, 2 ); + add_float( SOUT_CFG_PREFIX "aq-strength", 1.0, NULL, AQ_STRENGTH_TEXT, + AQ_STRENGTH_LONGTEXT, false ); +#endif /* Analysis */ /* x264 partitions = none (default). set at least "normal" mode. */ add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT, - ANALYSE_LONGTEXT, VLC_FALSE ); + ANALYSE_LONGTEXT, false ); change_string_list( enc_analyse_list, enc_analyse_list_text, 0 ); add_deprecated_alias( SOUT_CFG_PREFIX "analyse" ); /* Deprecated since 0.8.6 */ add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT, - DIRECT_PRED_LONGTEXT, VLC_FALSE ); + DIRECT_PRED_LONGTEXT, false ); change_string_list( direct_pred_list, direct_pred_list_text, 0 ); #if X264_BUILD >= 52 /* r573 */ add_integer( SOUT_CFG_PREFIX "direct-8x8", -1, NULL, DIRECT_PRED_SIZE_TEXT, - DIRECT_PRED_SIZE_LONGTEXT, VLC_FALSE ); + DIRECT_PRED_SIZE_LONGTEXT, 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 ); + WEIGHTB_LONGTEXT, false ); #endif #if X264_BUILD >= 24 /* r221 */ add_string( SOUT_CFG_PREFIX "me", "hex", NULL, ME_TEXT, - ME_LONGTEXT, VLC_FALSE ); + ME_LONGTEXT, false ); change_string_list( enc_me_list, enc_me_list_text, 0 ); add_integer( SOUT_CFG_PREFIX "merange", 16, NULL, MERANGE_TEXT, - MERANGE_LONGTEXT, VLC_FALSE ); + MERANGE_LONGTEXT, false ); change_integer_range( 1, 64 ); #endif add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT, - MVRANGE_LONGTEXT, VLC_FALSE ); + MVRANGE_LONGTEXT, false ); #if X264_BUILD >= 55 /* r607 */ add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT, - MVRANGE_THREAD_LONGTEXT, VLC_FALSE ); + MVRANGE_THREAD_LONGTEXT, false ); #endif add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT, - SUBME_LONGTEXT, VLC_FALSE ); + SUBME_LONGTEXT, false ); change_integer_range( 1, SUBME_MAX ); add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ); /* Deprecated since 0.8.5 */ #if X264_BUILD >= 41 /* r368 */ add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT, - B_RDO_LONGTEXT, VLC_FALSE ); + B_RDO_LONGTEXT, false ); #endif #if X264_BUILD >= 36 /* r318 */ add_bool( SOUT_CFG_PREFIX "mixed-refs", 0, NULL, MIXED_REFS_TEXT, - MIXED_REFS_LONGTEXT, VLC_FALSE ); + MIXED_REFS_LONGTEXT, false ); #endif #if X264_BUILD >= 23 /* r171 */ add_bool( SOUT_CFG_PREFIX "chroma-me", 1, NULL, CHROMA_ME_TEXT, - CHROMA_ME_LONGTEXT, VLC_FALSE ); + CHROMA_ME_LONGTEXT, false ); #endif #if X264_BUILD >= 43 /* r390 */ add_bool( SOUT_CFG_PREFIX "bime", 0, NULL, BIME_TEXT, - BIME_LONGTEXT, VLC_FALSE ); + BIME_LONGTEXT, false ); #endif #if X264_BUILD >= 30 /* r251 */ add_bool( SOUT_CFG_PREFIX "8x8dct", 0, NULL, TRANSFORM_8X8DCT_TEXT, - TRANSFORM_8X8DCT_LONGTEXT, VLC_FALSE ); + TRANSFORM_8X8DCT_LONGTEXT, false ); #endif #if X264_BUILD >= 39 /* r360 */ add_integer( SOUT_CFG_PREFIX "trellis", 0, NULL, TRELLIS_TEXT, - TRELLIS_LONGTEXT, VLC_FALSE ); + TRELLIS_LONGTEXT, false ); change_integer_range( 0, 2 ); #endif #if X264_BUILD >= 42 /* r384 */ add_bool( SOUT_CFG_PREFIX "fast-pskip", 1, NULL, FAST_PSKIP_TEXT, - FAST_PSKIP_LONGTEXT, VLC_FALSE ); + FAST_PSKIP_LONGTEXT, false ); #endif #if X264_BUILD >= 46 /* r503 */ add_bool( SOUT_CFG_PREFIX "dct-decimate", 1, NULL, DCT_DECIMATE_TEXT, - DCT_DECIMATE_LONGTEXT, VLC_FALSE ); + DCT_DECIMATE_LONGTEXT, false ); #endif #if X264_BUILD >= 44 /* r398 */ add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT, - NR_LONGTEXT, VLC_FALSE ); + NR_LONGTEXT, false ); 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 ); + DEADZONE_INTRA_LONGTEXT, false ); change_integer_range( 0, 32 ); add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, NULL, DEADZONE_INTRA_TEXT, - DEADZONE_INTRA_LONGTEXT, VLC_FALSE ); + DEADZONE_INTRA_LONGTEXT, false ); change_integer_range( 0, 32 ); #endif @@ -628,47 +650,47 @@ vlc_module_begin(); #if X264_BUILD >= 55 /* r607 */ add_bool( SOUT_CFG_PREFIX "non-deterministic", 0, NULL, NON_DETERMINISTIC_TEXT, - NON_DETERMINISTIC_LONGTEXT, VLC_FALSE ); + NON_DETERMINISTIC_LONGTEXT, false ); #endif add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT, - ASM_LONGTEXT, VLC_FALSE ); + ASM_LONGTEXT, false ); /* x264 psnr = 1 (default). disable PSNR computation for speed. */ add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT, - PSNR_LONGTEXT, VLC_FALSE ); + PSNR_LONGTEXT, false ); #if X264_BUILD >= 50 /* r554 */ /* x264 ssim = 1 (default). disable SSIM computation for speed. */ add_bool( SOUT_CFG_PREFIX "ssim", 0, NULL, SSIM_TEXT, - SSIM_LONGTEXT, VLC_FALSE ); + SSIM_LONGTEXT, false ); #endif add_bool( SOUT_CFG_PREFIX "quiet", 0, NULL, QUIET_TEXT, - QUIET_LONGTEXT, VLC_FALSE ); + QUIET_LONGTEXT, false ); #if X264_BUILD >= 47 /* r518 */ add_integer( SOUT_CFG_PREFIX "sps-id", 0, NULL, SPS_ID_TEXT, - SPS_ID_LONGTEXT, VLC_FALSE ); + SPS_ID_LONGTEXT, false ); #endif add_bool( SOUT_CFG_PREFIX "aud", 0, NULL, AUD_TEXT, - AUD_LONGTEXT, VLC_FALSE ); + AUD_LONGTEXT, false ); #if X264_BUILD >= 0x000e /* r81 */ add_bool( SOUT_CFG_PREFIX "verbose", 0, NULL, VERBOSE_TEXT, - VERBOSE_LONGTEXT, VLC_FALSE ); + VERBOSE_LONGTEXT, false ); #endif add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT, - STATS_LONGTEXT, VLC_FALSE ); + STATS_LONGTEXT, false ); vlc_module_end(); /***************************************************************************** * Local prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { +static const char *const ppsz_sout_options[] = { "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", @@ -679,7 +701,8 @@ static const char *ppsz_sout_options[] = { "pre-scenecut", "psnr", "qblur", "qp", "qcomp", "qpstep", "qpmax", "qpmin", "qp-max", "qp-min", "quiet", "ratetol", "ref", "scenecut", "sps-id", "ssim", "stats", "subme", "subpel", "tolerance", "trellis", - "verbose", "vbv-bufsize", "vbv-init", "vbv-maxrate", "weightb", NULL + "verbose", "vbv-bufsize", "vbv-init", "vbv-maxrate", "weightb", "aq-mode", + "aq-strength",NULL }; static block_t *Encode( encoder_t *, picture_t * ); @@ -715,7 +738,8 @@ static int Open ( vlc_object_t *p_this ) return VLC_EGENERIC; } - msg_Dbg ( p_enc, "x264 core:%d", X264_BUILD ); + /* X264_POINTVER or X264_VERSION are not available */ + msg_Dbg ( p_enc, "version x264 0.%d.X", X264_BUILD ); #if X264_BUILD < 37 if( p_enc->fmt_in.video.i_width % 16 != 0 || @@ -745,6 +769,8 @@ static int Open ( vlc_object_t *p_this ) p_enc->pf_encode_video = Encode; p_enc->pf_encode_audio = NULL; p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; p_sys->i_interpolated_dts = 0; p_sys->psz_stat_name = NULL; @@ -759,20 +785,20 @@ static int Open ( vlc_object_t *p_this ) /* average bitrate specified by transcode vb */ p_sys->param.rc.i_bitrate = p_enc->fmt_out.i_bitrate / 1000; -#if X264_BUILD < 48 - /* cbr = 1 overrides qp or crf and sets an average bitrate - but maxrate = average bitrate is needed for "real" CBR */ - if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1; -#else - if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = X264_RC_ABR; -#endif - var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val ); if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int; var_Get( p_enc, SOUT_CFG_PREFIX "qpmin", &val ); - if( val.i_int >= 0 && val.i_int <= 51 ) i_qmin = val.i_int; + if( val.i_int >= 0 && val.i_int <= 51 ) + { + i_qmin = val.i_int; + p_sys->param.rc.i_qp_min = i_qmin; + } var_Get( p_enc, SOUT_CFG_PREFIX "qpmax", &val ); - if( val.i_int >= 0 && val.i_int <= 51 ) i_qmax = val.i_int; + if( val.i_int >= 0 && val.i_int <= 51 ) + { + i_qmax = val.i_int; + p_sys->param.rc.i_qp_max = i_qmax; + } var_Get( p_enc, SOUT_CFG_PREFIX "qp", &val ); if( val.i_int >= 0 && val.i_int <= 51 ) @@ -780,6 +806,7 @@ static int Open ( vlc_object_t *p_this ) if( i_qmin > val.i_int ) i_qmin = val.i_int; if( i_qmax < val.i_int ) i_qmax = val.i_int; + p_sys->param.rc.i_rc_method = X264_RC_CQP; #if X264_BUILD >= 0x000a p_sys->param.rc.i_qp_constant = val.i_int; p_sys->param.rc.i_qp_min = i_qmin; @@ -789,6 +816,14 @@ static int Open ( vlc_object_t *p_this ) #endif } +#if X264_BUILD < 48 + /* cbr = 1 overrides qp or crf and sets an average bitrate + but maxrate = average bitrate is needed for "real" CBR */ + if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1; +#else + if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = X264_RC_ABR; +#endif + #if X264_BUILD >= 24 var_Get( p_enc, SOUT_CFG_PREFIX "ratetol", &val ); p_sys->param.rc.f_rate_tolerance = val.f_float; @@ -860,6 +895,14 @@ static int Open ( vlc_object_t *p_this ) var_Get( p_enc, SOUT_CFG_PREFIX "qblur", &val ); p_sys->param.rc.f_qblur = val.f_float; +#if X264_BUILD >= 59 + var_Get( p_enc, SOUT_CFG_PREFIX "aq-mode", &val ); + p_sys->param.rc.i_aq_mode = val.i_int; + + var_Get( p_enc, SOUT_CFG_PREFIX "aq-strength", &val ); + p_sys->param.rc.f_aq_strength = val.f_float; +#endif + #if X264_BUILD >= 0x000e var_Get( p_enc, SOUT_CFG_PREFIX "verbose", &val ); if( val.b_bool ) p_sys->param.i_log_level = X264_LOG_DEBUG; @@ -938,13 +981,13 @@ static int Open ( vlc_object_t *p_this ) { p_sys->param.analyse.i_me_method = X264_ME_ESA; } - #if X264_BUILD >= 58 /* r728 */ - else if( !strcmp( val.psz_string, "tesa" ) ) - { - p_sys->param.analyse.i_me_method = X264_ME_TESA; - } - #endif - if( val.psz_string ) free( val.psz_string ); +# if X264_BUILD >= 58 /* r728 */ + else if( !strcmp( val.psz_string, "tesa" ) ) + { + p_sys->param.analyse.i_me_method = X264_ME_TESA; + } +# endif + free( val.psz_string ); var_Get( p_enc, SOUT_CFG_PREFIX "merange", &val ); if( val.i_int >= 0 && val.i_int <= 64 ) @@ -978,7 +1021,7 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO; } #endif - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); var_Get( p_enc, SOUT_CFG_PREFIX "psnr", &val ); p_sys->param.analyse.b_psnr = val.b_bool; @@ -1018,14 +1061,14 @@ 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 +# if X264_BUILD >= 54 p_sys->param.rc.f_rf_constant = val.i_int; -#else +# else p_sys->param.rc.i_rf_constant = val.i_int; -#endif -#if X264_BUILD >= 48 +# endif +# if X264_BUILD >= 48 p_sys->param.rc.i_rc_method = X264_RC_CRF; -#endif +# endif } #endif @@ -1120,7 +1163,7 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.analyse.inter |= X264_ANALYSE_I8x8; #endif } - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); #if X264_BUILD >= 30 var_Get( p_enc, SOUT_CFG_PREFIX "8x8dct", &val ); @@ -1140,6 +1183,7 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.vui.i_sar_width = i_dst_num; p_sys->param.vui.i_sar_height = i_dst_den; } + if( p_enc->fmt_in.video.i_frame_rate_base > 0 ) { p_sys->param.i_fps_num = p_enc->fmt_in.video.i_frame_rate; @@ -1164,12 +1208,13 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.cpu &= ~X264_CPU_SSE2; } + /* BUILD 29 adds support for multi-threaded encoding while BUILD 49 (r543) + also adds support for threads = 0 for automatically selecting an optimal + value (cores * 1.5) based on detected CPUs. Default behavior for x264 is + threads = 1, however VLC usage differs and uses threads = 0 (auto) by + default unless ofcourse transcode threads is explicitly specified.. */ #if X264_BUILD >= 29 - /* As of r543 x264 will autodetect the number of cpus and will set - the number of threads accordingly unless ofcourse the number of - threads is explicitly specified... */ - if( p_enc->i_threads >= 1 ) - p_sys->param.i_threads = p_enc->i_threads; + p_sys->param.i_threads = p_enc->i_threads; #endif var_Get( p_enc, SOUT_CFG_PREFIX "stats", &val ); @@ -1187,7 +1232,9 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.rc.b_stat_read = val.i_int & 2; } - /* We need to initialize pthreadw32 before we open the encoder, but only oncce for the whole application. Since pthreadw32 doesn't keep a refcount, do it ouurselves */ + /* We need to initialize pthreadw32 before we open the encoder, + but only oncce for the whole application. Since pthreadw32 + doesn't keep a refcount, do it ourselves. */ #ifdef PTW32_STATIC_LIB vlc_value_t lock, count; @@ -1199,10 +1246,10 @@ static int Open ( vlc_object_t *p_this ) var_Get( p_enc->p_libvlc, "pthread_win32_count", &count ); if( count.i_int == 0 ) - { + { msg_Dbg( p_enc, "initializing pthread-win32" ); if( !pthread_win32_process_attach_np() || !pthread_win32_thread_attach_np() ) - { + { msg_Warn( p_enc, "pthread Win32 Initialization failed" ); vlc_mutex_unlock( lock.p_address ); return VLC_EGENERIC; @@ -1222,6 +1269,11 @@ static int Open ( vlc_object_t *p_this ) p_sys->i_buffer = 4 * p_enc->fmt_in.video.i_width * p_enc->fmt_in.video.i_height + 1000; p_sys->p_buffer = malloc( p_sys->i_buffer ); + if( !p_sys->p_buffer ) + { + Close( VLC_OBJECT(p_enc) ); + return VLC_ENOMEM; + } /* get the globals headers */ p_enc->fmt_out.i_extra = 0; @@ -1230,14 +1282,21 @@ static int Open ( vlc_object_t *p_this ) x264_encoder_headers( p_sys->h, &nal, &i_nal ); for( i = 0; i < i_nal; i++ ) { + void *p_tmp; int i_size = p_sys->i_buffer; x264_nal_encode( p_sys->p_buffer, &i_size, 1, &nal[i] ); - p_enc->fmt_out.p_extra = realloc( p_enc->fmt_out.p_extra, p_enc->fmt_out.i_extra + i_size ); + p_tmp = realloc( p_enc->fmt_out.p_extra, p_enc->fmt_out.i_extra + i_size ); + if( !p_tmp ) + { + Close( VLC_OBJECT(p_enc) ); + return VLC_ENOMEM; + } + p_enc->fmt_out.p_extra = p_tmp; memcpy( (uint8_t*)p_enc->fmt_out.p_extra + p_enc->fmt_out.i_extra, - p_sys->p_buffer, i_size ); + p_sys->p_buffer, i_size ); p_enc->fmt_out.i_extra += i_size; } @@ -1284,6 +1343,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) } p_block = block_New( p_enc, i_out ); + if( !p_block ) return NULL; memcpy( p_block->p_buffer, p_sys->p_buffer, i_out ); if( pic.i_type == X264_TYPE_IDR || pic.i_type == X264_TYPE_I ) @@ -1294,7 +1354,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) p_block->i_flags |= BLOCK_FLAG_TYPE_B; /* This isn't really valid for streams with B-frames */ - p_block->i_length = I64C(1000000) * + p_block->i_length = INT64_C(1000000) * p_enc->fmt_in.video.i_frame_rate_base / p_enc->fmt_in.video.i_frame_rate; @@ -1338,9 +1398,8 @@ static void Close( vlc_object_t *p_this ) { encoder_t *p_enc = (encoder_t *)p_this; encoder_sys_t *p_sys = p_enc->p_sys; - - if( p_sys->psz_stat_name ) - free( p_sys->psz_stat_name ); + + free( p_sys->psz_stat_name ); x264_encoder_close( p_sys->h ); @@ -1357,7 +1416,7 @@ static void Close( vlc_object_t *p_this ) var_Set( p_enc->p_libvlc, "pthread_win32_count", count ); if( count.i_int == 0 ) - { + { pthread_win32_thread_detach_np(); pthread_win32_process_detach_np(); msg_Dbg( p_enc, "pthread-win32 deinitialized" );