X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fx264.c;h=8428ca1f906e95de72ff1737daf05e084218167d;hb=4b6374f99c8fffa99fc259bc120f090188298591;hp=b18700cbc83143faa3242ca19f85267ecd75bec8;hpb=027fcc8a5cd0f6a5be67d7f6f96f50f0975be924;p=vlc diff --git a/modules/codec/x264.c b/modules/codec/x264.c index b18700cbc8..8428ca1f90 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -25,9 +25,9 @@ * Preamble *****************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include @@ -67,6 +67,12 @@ static void Close( vlc_object_t * ); "I-frames are inserted only every other keyint frames, which probably " \ "leads to ugly encoding artifacts. Range 1 to 100." ) +#if X264_BUILD >= 55 /* r607 */ +#define PRESCENE_TEXT N_("Faster, less precise scenecut detection" ) +#define PRESCENE_LONGTEXT N_( "Faster, less precise scenecut detection. " \ + "Required and implied by multi-threading." ) +#endif + #define BFRAMES_TEXT N_("B-frames between I and P") #define BFRAMES_LONGTEXT N_( "Number of consecutive B-frames between I and " \ "P-frames. Range 1 to 16." ) @@ -163,6 +169,12 @@ static void Close( vlc_object_t * ); #define CHROMA_QP_OFFSET_TEXT N_("QP difference between chroma and luma") #define CHROMA_QP_OFFSET_LONGTEXT N_( "QP difference between chroma and luma.") +#define PASS_TEXT N_("Multipass ratecontrol") +#define PASS_LONGTEXT N_( "Multipass ratecontrol:\n" \ + " - 1: First pass, creates stats file\n" \ + " - 2: Last pass, does not overwrite stats file\n" \ + " - 3: Nth pass, overwrites stats file\n" ) + #define QCOMP_TEXT N_("QP curve compression") #define QCOMP_LONGTEXT N_( "QP curve compression. Range 0.0 (CBR) to 1.0 (QCP).") @@ -206,12 +218,24 @@ static void Close( vlc_object_t * ); " - umh: uneven multi-hexagon search (better but slower)\n" \ " - esa: exhaustive search (extremely slow, primarily for testing)\n" ) +#if X264_BUILD >= 24 #define MERANGE_TEXT N_("Maximum motion vector search range") #define MERANGE_LONGTEXT N_( "Maximum distance to search for " \ "motion estimation, measured from predicted position(s). " \ "Default of 16 is good for most footage, high motion sequences may " \ "benefit from settings between 24 and 32. Range 0 to 64." ) +#define MVRANGE_TEXT N_("Maximum motion vector length") +#define MVRANGE_LONGTEXT N_( "Maximum motion vector length in pixels. " \ + "-1 is automatic, based on level." ) +#endif + +#if X264_BUILD >= 55 /* r607 */ +#define MVRANGE_THREAD_TEXT N_("Minimum buffer space between threads") +#define MVRANGE_THREAD_LONGTEXT N_( "Minimum buffer space between threads. " \ + "-1 is automatic, based on number of threads." ) +#endif + #define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \ "quality") #if X264_BUILD >= 46 /* r477 */ @@ -282,9 +306,18 @@ static void Close( vlc_object_t * ); /* Input/Output */ +#if X264_BUILD >= 55 /* r607 */ +#define NON_DETERMINISTIC_TEXT N_("Non-deterministic optimizations when threaded") +#define NON_DETERMINISTIC_LONGTEXT N_( "Slightly improve quality of SMP, " \ + "at the cost of repeatability.") +#endif + #define ASM_TEXT N_("CPU optimizations") #define ASM_LONGTEXT N_( "Use assembler CPU optimizations.") +#define STATS_TEXT N_("Filename for 2 pass stats file") +#define STATS_LONGTEXT N_( "Filename for 2 pass stats file for multi-pass encoding.") + #define PSNR_TEXT N_("PSNR computation") #define PSNR_LONGTEXT N_( "Compute and print PSNR stats. This has no effect on " \ "the actual encoding quality." ) @@ -309,28 +342,27 @@ static void Close( vlc_object_t * ); #define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.") #if X264_BUILD >= 24 -static char *enc_me_list[] = - { "", "dia", "hex", "umh", "esa" }; -static char *enc_me_list_text[] = - { N_("default"), N_("dia"), N_("hex"), N_("umh"), N_("esa") }; +static const char *enc_me_list[] = + { "dia", "hex", "umh", "esa" }; +static const char *enc_me_list_text[] = + { N_("dia"), N_("hex"), N_("umh"), N_("esa") }; #endif -static char *enc_analyse_list[] = - { "", "none", "fast", "normal", "slow", "all" }; -static char *enc_analyse_list_text[] = - { N_("default"), N_("none"), N_("fast"), N_("normal"), - N_("slow"), N_("all") }; +static const char *enc_analyse_list[] = + { "none", "fast", "normal", "slow", "all" }; +static const char *enc_analyse_list_text[] = + { N_("none"), N_("fast"), N_("normal"), N_("slow"), N_("all") }; #if X264_BUILD >= 45 /* r457 */ -static char *direct_pred_list[] = - { "", "none", "spatial", "temporal", "auto" }; -static char *direct_pred_list_text[] = - { N_("default"), N_("none"), N_("spatial"), N_("temporal"), N_("auto") }; +static const char *direct_pred_list[] = + { "none", "spatial", "temporal", "auto" }; +static const char *direct_pred_list_text[] = + { N_("none"), N_("spatial"), N_("temporal"), N_("auto") }; #else -static char *direct_pred_list[] = - { "", "none", "spatial", "temporal" }; -static char *direct_pred_list_text[] = - { N_("default"), N_("none"), N_("spatial"), N_("temporal") }; +static const char *direct_pred_list[] = + { "none", "spatial", "temporal" }; +static const char *direct_pred_list_text[] = + { N_("none"), N_("spatial"), N_("temporal") }; #endif vlc_module_begin(); @@ -353,6 +385,11 @@ vlc_module_begin(); SCENE_LONGTEXT, VLC_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 ); +#endif + add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT, BFRAMES_LONGTEXT, VLC_FALSE ); change_integer_range( 0, 16 ); @@ -374,14 +411,14 @@ 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 "deblock", "", 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 */ @@ -407,13 +444,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 ); @@ -421,8 +458,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 ); @@ -447,6 +484,10 @@ vlc_module_begin(); CHROMA_QP_OFFSET_LONGTEXT, VLC_FALSE ); #endif + add_integer( SOUT_CFG_PREFIX "pass", 0, NULL, PASS_TEXT, + PASS_LONGTEXT, VLC_FALSE ); + change_integer_range( 0, 3 ); + add_float( SOUT_CFG_PREFIX "qcomp", 0.60, NULL, QCOMP_TEXT, QCOMP_LONGTEXT, VLC_FALSE ); change_float_range( 0, 1 ); @@ -462,8 +503,8 @@ vlc_module_begin(); /* x264 partitions = none (default). set at least "normal" mode. */ add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT, ANALYSE_LONGTEXT, VLC_FALSE ); - add_deprecated( SOUT_CFG_PREFIX "analyse", VLC_FALSE ); /* Deprecated since 0.8.6 */ 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 ); @@ -490,10 +531,18 @@ vlc_module_begin(); change_integer_range( 1, 64 ); #endif + add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT, + MVRANGE_LONGTEXT, VLC_FALSE ); + +#if X264_BUILD >= 55 /* r607 */ + add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT, + MVRANGE_THREAD_LONGTEXT, VLC_FALSE ); +#endif + 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, @@ -554,13 +603,13 @@ vlc_module_begin(); /* Input/Output */ -#if defined(__DARWIN__) && defined(__INTEL__) - add_bool( SOUT_CFG_PREFIX "asm", 0, NULL, ASM_TEXT, - ASM_LONGTEXT, VLC_FALSE ); -#else +#if X264_BUILD >= 55 /* r607 */ + add_bool( SOUT_CFG_PREFIX "non-deterministic", 0, NULL, NON_DETERMINISTIC_TEXT, + NON_DETERMINISTIC_LONGTEXT, VLC_FALSE ); +#endif + 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, @@ -588,6 +637,9 @@ vlc_module_begin(); VERBOSE_LONGTEXT, VLC_FALSE ); #endif + add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT, + STATS_LONGTEXT, VLC_FALSE ); + vlc_module_end(); /***************************************************************************** @@ -599,11 +651,12 @@ static const char *ppsz_sout_options[] = { "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 + "me", "merange", "min-keyint", "mixed-refs", "mvrange", "mvrange-thread", + "nf", "non-deterministic", "nr", "partitions", "pass", "pbratio", + "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 }; static block_t *Encode( encoder_t *, picture_t * ); @@ -617,6 +670,8 @@ struct encoder_sys_t uint8_t *p_buffer; mtime_t i_last_ref_pts; + + char *psz_stat_name; }; /***************************************************************************** @@ -666,6 +721,7 @@ static int Open ( vlc_object_t *p_this ) p_enc->pf_encode_audio = NULL; p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) ); p_sys->i_last_ref_pts = 0; + p_sys->psz_stat_name = NULL; x264_param_default( &p_sys->param ); p_sys->param.i_width = p_enc->fmt_in.video.i_width; @@ -828,6 +884,13 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.i_scenecut_threshold = val.i_int; #endif +#if X264_BUILD >= 55 /* r607 */ + var_Get( p_enc, SOUT_CFG_PREFIX "pre-scenecut", &val ); + p_sys->param.b_pre_scenecut = val.b_bool; + var_Get( p_enc, SOUT_CFG_PREFIX "non-deterministic", &val ); + p_sys->param.b_deterministic = val.b_bool; +#endif + var_Get( p_enc, SOUT_CFG_PREFIX "subme", &val ); if( val.i_int >= 1 && val.i_int <= SUBME_MAX ) p_sys->param.analyse.i_subpel_refine = val.i_int; @@ -853,8 +916,16 @@ static int Open ( vlc_object_t *p_this ) if( val.psz_string ) free( val.psz_string ); var_Get( p_enc, SOUT_CFG_PREFIX "merange", &val ); - if( val.i_int >= 1 && val.i_int <= 64 ) + if( val.i_int >= 0 && val.i_int <= 64 ) p_sys->param.analyse.i_me_range = val.i_int; + + var_Get( p_enc, SOUT_CFG_PREFIX "mvrange", &val ); + p_sys->param.analyse.i_mv_range = val.i_int; +#endif + +#if X264_BUILD >= 55 /* r607 */ + var_Get( p_enc, SOUT_CFG_PREFIX "mvrange-thread", &val ); + p_sys->param.analyse.i_mv_range_thread = val.i_int; #endif var_Get( p_enc, SOUT_CFG_PREFIX "direct", &val ); @@ -1043,19 +1114,21 @@ 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_global->i_cpu & CPU_CAPABILITY_MMX) ) + + unsigned i_cpu = vlc_CPU(); + if( !(i_cpu & CPU_CAPABILITY_MMX) ) { p_sys->param.cpu &= ~X264_CPU_MMX; } - if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) ) + if( !(i_cpu & CPU_CAPABILITY_MMXEXT) ) { p_sys->param.cpu &= ~X264_CPU_MMXEXT; } - if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) ) + if( !(i_cpu & CPU_CAPABILITY_SSE) ) { p_sys->param.cpu &= ~X264_CPU_SSE; } - if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE2) ) + if( !(i_cpu & CPU_CAPABILITY_SSE2) ) { p_sys->param.cpu &= ~X264_CPU_SSE2; } @@ -1068,6 +1141,21 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.i_threads = p_enc->i_threads; #endif + var_Get( p_enc, SOUT_CFG_PREFIX "stats", &val ); + if( val.psz_string ) + { + p_sys->param.rc.psz_stat_in = + p_sys->param.rc.psz_stat_out = + p_sys->psz_stat_name = val.psz_string; + } + + var_Get( p_enc, SOUT_CFG_PREFIX "pass", &val ); + if( val.i_int > 0 && val.i_int <= 3 ) + { + p_sys->param.rc.b_stat_write = val.i_int & 1; + p_sys->param.rc.b_stat_read = val.i_int & 2; + } + /* Open the encoder */ p_sys->h = x264_encoder_open( &p_sys->param ); @@ -1185,6 +1273,9 @@ 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 ); x264_encoder_close( p_sys->h ); free( p_sys->p_buffer );