X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fx264.c;h=bbd1f926a6f7fed90d31f7bec127e9f69e391a2c;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=1a89104e641309ac05c398976e54b504f22fdcde;hpb=244ac193b056a3ca41036dfaeeae95627d78774d;p=vlc diff --git a/modules/codec/x264.c b/modules/codec/x264.c index 1a89104e64..bbd1f926a6 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -25,9 +25,9 @@ * Preamble *****************************************************************************/ #include -#include -#include -#include +#include +#include +#include #include @@ -43,20 +43,20 @@ static void Close( vlc_object_t * ); #define KEYINT_TEXT N_("Maximum GOP size") #define KEYINT_LONGTEXT N_( "Sets maximum interval between IDR-frames." \ - "Larger values save bits, thus improving quality for a given bitrate at " \ - "the cost of seeking precision." ) + "Larger values save bits, thus improving quality for a given bitrate at " \ + "the cost of seeking precision." ) #define MIN_KEYINT_TEXT N_("Minimum GOP size") #define MIN_KEYINT_LONGTEXT N_( "Sets minimum interval between IDR-frames. " \ "In H.264, I-frames do not necessarily bound a closed GOP because it is " \ "allowable for a P-frame to be predicted from more frames than just the " \ - "one frame before it (also see frameref). Therefore, I-frames are not " \ - "necessarily seekable. IDR-Frames restrict subsequent P-frames from " \ - "referring to any frame prior to the IDR-Frame. \n" \ + "one frame before it (also see reference frame option). Therefore, " \ + "I-frames are not necessarily seekable. IDR-frames restrict subsequent " \ + "P-frames from referring to any frame prior to the IDR-frame. \n" \ "If scenecuts appear within this interval, they are still encoded as " \ "I-frames, but do not start a new GOP." ) -#define SCENE_TEXT N_("Extra I-Frames aggressivity" ) +#define SCENE_TEXT N_("Extra I-frames aggressivity" ) #define SCENE_LONGTEXT N_( "Scene-cut detection. Controls how " \ "aggressively to insert extra I-frames. With small values of " \ "scenecut, the codec often has " \ @@ -64,20 +64,26 @@ static void Close( vlc_object_t * ); "Good values of scenecut may find a better location for the " \ "I-frame. Large values use more I-frames " \ "than necessary, thus wasting bits. -1 disables scene-cut detection, so " \ - "I-frames are be inserted only every other keyint frames, which probably " \ - "leads to ugly encoding artifacts. (1-100)." ) + "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. (1 to 16)" ) + "P-frames. Range 1 to 16." ) #define B_ADAPT_TEXT N_("Adaptive B-frame decision") #define B_ADAPT_LONGTEXT N_( "Force the specified number of " \ - "consecutive B-frames to be used, except possibly before an I-frame. " ) + "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. " ) + "cause more B-frames, negative values cause less B-frames." ) #define BPYRAMID_TEXT N_("Keep some B-frames as references") #define BPYRAMID_LONGTEXT N_( "Allows B-frames to be used as references for " \ @@ -87,30 +93,49 @@ static void Close( vlc_object_t * ); #define CABAC_TEXT N_("CABAC") #define CABAC_LONGTEXT N_( "CABAC (Context-Adaptive Binary Arithmetic "\ "Coding). Slightly slows down encoding and decoding, but should save " \ - "10-15% bitrate." ) + "10 to 15% bitrate." ) #define REF_TEXT N_("Number of reference frames") #define REF_LONGTEXT N_( "Number of previous frames used as predictors. " \ "This is effective in Anime, but seems to make little difference in " \ "live-action source material. Some decoders are unable to deal with " \ - "large frameref values. From 1 to 16" ) + "large frameref values. Range 1 to 16." ) #define NF_TEXT N_("Skip loop filter") #define NF_LONGTEXT N_( "Deactivate the deblocking loop filter (decreases quality).") +#define FILTER_TEXT N_("Loop filter AlphaC0 and Beta parameters alpha:beta") +#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 */ #define QP_TEXT N_("Set QP") #define QP_LONGTEXT N_( "This selects the quantizer to use. " \ "Lower values result in better fidelity, but higher bitrates. 26 is a " \ - "good default value. From 0 to 51. 0 means lossless" ) + "good default value. Range 0 (lossless) to 51." ) #define CRF_TEXT N_("Quality-based VBR") -#define CRF_LONGTEXT N_( "1-pass Quality-based VBR. From 0 to 51" ) +#define CRF_LONGTEXT N_( "1-pass Quality-based VBR. Range 0 to 51." ) #define QPMIN_TEXT N_("Min QP") -#define QPMIN_LONGTEXT N_( "Minimum quantizer, 15/35 seems to be a useful " \ - "range." ) +#define QPMIN_LONGTEXT N_( "Minimum quantizer parameter. 15 to 35 seems to " \ + "be a useful range." ) #define QPMAX_TEXT N_("Max QP") #define QPMAX_LONGTEXT N_( "Maximum quantizer parameter." ) @@ -119,39 +144,47 @@ static void Close( vlc_object_t * ); #define QPSTEP_LONGTEXT N_( "Max QP step between frames.") #define RATETOL_TEXT N_("Average bitrate tolerance") -#define RATETOL_LONGTEXT N_( "Allowed variance in average. " \ +#define RATETOL_LONGTEXT N_( "Allowed variance in average " \ "bitrate (in kbits/s).") #define VBV_MAXRATE_TEXT N_("Max local bitrate") -#define VBV_MAXRATE_LONGTEXT N_( "Sets a maximum local bitrate in kbits/s.") +#define VBV_MAXRATE_LONGTEXT N_( "Sets a maximum local bitrate (in kbits/s).") #define VBV_BUFSIZE_TEXT N_("VBV buffer") #define VBV_BUFSIZE_LONGTEXT N_( "Averaging period for the maximum " \ - "local bitrate in kbits.") + "local bitrate (in kbits).") #define VBV_INIT_TEXT N_("Initial VBV buffer occupancy") #define VBV_INIT_LONGTEXT N_( "Sets the initial buffer occupancy as a " \ - "fraction of the buffer size.") + "fraction of the buffer size. Range 0.0 to 1.0.") +/* 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.") +#define IPRATIO_LONGTEXT N_( "QP factor between I and P. Range 1.0 to 2.0.") +/* PB ratio < 1 is not valid and breaks ratecontrol */ #define PBRATIO_TEXT N_("QP factor between P and B") -#define PBRATIO_LONGTEXT N_( "QP factor between P and B.") +#define PBRATIO_LONGTEXT N_( "QP factor between P and B. Range 1.0 to 2.0.") #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. (0.0=CBR to 1.0=QCP)") +#define QCOMP_LONGTEXT N_( "QP curve compression. Range 0.0 (CBR) to 1.0 (QCP).") #define CPLXBLUR_TEXT N_("Reduce fluctuations in QP") #define CPLXBLUR_LONGTEXT N_( "This reduces the fluctuations in QP " \ - "before curve compression. Temporally blurs complexity.") + "before curve compression. Temporally blurs complexity.") #define QBLUR_TEXT N_("Reduce fluctuations in QP") #define QBLUR_LONGTEXT N_( "This reduces the fluctations in QP " \ - "after curve compression. Temporally blurs quants.") + "after curve compression. Temporally blurs quants.") /* Analysis */ @@ -165,7 +198,15 @@ static void Close( vlc_object_t * ); "(p4x4 requires p8x8. i8x8 requires 8x8dct).") #define DIRECT_PRED_TEXT N_("Direct MV prediction mode") -#define DIRECT_PRED_LONGTEXT 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.") @@ -177,81 +218,152 @@ 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-32. " \ - "From 0 to 64." ) + "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 */ +#define SUBME_MAX 7 +#define SUBME_LONGTEXT N_( "This parameter controls quality versus speed " \ + "tradeoffs involved in the motion estimation decision process " \ + "(lower = quicker and higher = better quality). Range 1 to 7." ) +#elif X264_BUILD >= 30 /* r262 */ +#define SUBME_MAX 6 +#define SUBME_LONGTEXT N_( "This parameter controls quality versus speed " \ + "tradeoffs involved in the motion estimation decision process " \ + "(lower = quicker and higher = better quality). Range 1 to 6." ) +#else +#define SUBME_MAX 5 #define SUBME_LONGTEXT N_( "This parameter controls quality versus speed " \ "tradeoffs involved in the motion estimation decision process " \ - "(lower = quicker and higher = better quality). From 1 to 6." ) + "(lower = quicker and higher = better quality). Range 1 to 5." ) +#endif -#define B_RDO_TEXT N_("RD based mode decision for B-frames.") +#define B_RDO_TEXT N_("RD based mode decision for B-frames") #define B_RDO_LONGTEXT N_( "RD based mode decision for B-frames. This " \ - "requires subme 6.") + "requires subme 6 (or higher).") #define MIXED_REFS_TEXT N_("Decide references on a per partition basis") #define MIXED_REFS_LONGTEXT N_( "Allows each 8x8 or 16x8 partition to " \ - "independently " \ - "select a reference frame, as opposed to only one ref per macroblock." ) + "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.") + "P-frames.") #define BIME_TEXT N_("Jointly optimize both MVs in B-frames") #define BIME_LONGTEXT N_( "Joint bidirectional motion refinement.") #define TRANSFORM_8X8DCT_TEXT N_("Adaptive spatial transform size") #define TRANSFORM_8X8DCT_LONGTEXT N_( \ - "SATD-based decision for 8x8 transform in inter-MBs.") + "SATD-based decision for 8x8 transform in inter-MBs.") #define TRELLIS_TEXT N_("Trellis RD quantization" ) #define TRELLIS_LONGTEXT N_( "Trellis RD quantization: \n" \ - " - 0: disabled\n" \ - " - 1: enabled only on the final encode of a MB\n" \ - " - 2: enabled on all mode decisions\n" \ - "This requires CABAC." ) + " - 0: disabled\n" \ + " - 1: enabled only on the final encode of a MB\n" \ + " - 2: enabled on all mode decisions\n" \ + "This requires CABAC." ) #define FAST_PSKIP_TEXT N_("Early SKIP detection on P-frames") #define FAST_PSKIP_LONGTEXT N_( "Early SKIP detection on P-frames.") +#define DCT_DECIMATE_TEXT N_("Coefficient thresholding on P-frames") +#define DCT_DECIMATE_LONGTEXT N_( "Coefficient thresholding on P-frames." \ + "Eliminate dct blocks containing only a small single coefficient.") + +/* Noise reduction 1 is too weak to measure, suggest at least 10 */ #define NR_TEXT N_("Noise reduction") -#define NR_LONGTEXT N_( "Dct-domain noise reduction. Adaptive pseudo-deadzone.") +#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 */ +#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 PSNR_TEXT N_("PSNR calculation") -#define PSNR_LONGTEXT N_( "This has no effect on actual encoding quality, "\ - "it just prevents the stats from being calculated (for speed)." ) +#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." ) + +#define SSIM_TEXT N_("SSIM computation") +#define SSIM_LONGTEXT N_( "Compute and print SSIM stats. This has no effect on " \ + "the actual encoding quality." ) + +#define QUIET_TEXT N_("Quiet mode") +#define QUIET_LONGTEXT N_( "Quiet mode.") #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" }; -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") }; -static char *direct_pred_list[] = - { "", "none", "spatial", "temporal" }; -static char *direct_pred_list_text[] = - { N_("default"), N_("none"), N_("spatial"), N_("temporal") }; +#if X264_BUILD >= 45 /* r457 */ +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 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(); set_description( _("H.264/MPEG4 AVC encoder (using x264 library)")); @@ -259,7 +371,7 @@ vlc_module_begin(); set_callbacks( Open, Close ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_VCODEC ); - + /* Frame-type options */ add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT, @@ -267,12 +379,17 @@ vlc_module_begin(); add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT, MIN_KEYINT_LONGTEXT, VLC_FALSE ); - add_deprecated( SOUT_CFG_PREFIX "keyint-min", VLC_FALSE ); /* Deprecated since 0.8.5 */ + 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 ); 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 ); @@ -294,12 +411,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_alias( SOUT_CFG_PREFIX "frameref" ); /* 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_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 ); + 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 ); + +#if X264_BUILD >= 51 /* r570 */ + add_bool( SOUT_CFG_PREFIX "interlaced", 0, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT, + VLC_FALSE ); +#endif /* Ratecontrol */ @@ -315,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_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 ); - add_deprecated( SOUT_CFG_PREFIX "qp-max", VLC_FALSE ); /* Deprecated since 0.8.5 */ 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 ); @@ -329,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_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 ); @@ -344,17 +473,21 @@ vlc_module_begin(); add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT, IPRATIO_LONGTEXT, VLC_FALSE ); - change_float_range( 0, 100 ); + change_float_range( 1, 2 ); add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT, PBRATIO_LONGTEXT, VLC_FALSE ); - change_float_range( 0, 100 ); + 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 ); #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 ); @@ -367,14 +500,22 @@ vlc_module_begin(); /* Analysis */ - add_string( SOUT_CFG_PREFIX "analyse", "all", 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_alias( SOUT_CFG_PREFIX "analyse" ); /* Deprecated since 0.8.6 */ - add_string( SOUT_CFG_PREFIX "direct", "temporal", NULL, DIRECT_PRED_TEXT, + 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 ); @@ -390,14 +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 */ -#if X264_BUILD >= 30 /* r262 */ - change_integer_range( 1, 6 ); -#else - change_integer_range( 1, 5 ); -#endif + 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, @@ -435,39 +580,83 @@ vlc_module_begin(); FAST_PSKIP_LONGTEXT, VLC_FALSE ); #endif +#if X264_BUILD >= 46 /* r503 */ + add_bool( SOUT_CFG_PREFIX "dct-decimate", 1, NULL, DCT_DECIMATE_TEXT, + DCT_DECIMATE_LONGTEXT, VLC_FALSE ); +#endif + #if X264_BUILD >= 44 /* r398 */ add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT, NR_LONGTEXT, VLC_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 ); + 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 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 ); - /* x264 psnr = 1 (default). disable PSNR calculation for speed. */ + /* x264 psnr = 1 (default). disable PSNR computation for speed. */ add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT, PSNR_LONGTEXT, VLC_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 ); +#endif + + 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 ); #endif + add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT, + STATS_LONGTEXT, VLC_FALSE ); + 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", "direct", "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", "ratetol", "ref", "scenecut", - "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", "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 * ); @@ -481,6 +670,8 @@ struct encoder_sys_t uint8_t *p_buffer; mtime_t i_last_ref_pts; + + char *psz_stat_name; }; /***************************************************************************** @@ -492,6 +683,8 @@ static int Open ( vlc_object_t *p_this ) encoder_sys_t *p_sys; vlc_value_t val; int i_qmin = 0, i_qmax = 0; + x264_nal_t *nal; + int i, i_nal; if( p_enc->fmt_out.i_codec != VLC_FOURCC( 'h', '2', '6', '4' ) && !p_enc->b_force ) @@ -501,7 +694,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 ); @@ -519,7 +712,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'); @@ -528,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; @@ -540,9 +734,13 @@ 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; @@ -598,6 +796,30 @@ 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 "deblock", &val ); + if( val.psz_string ) + { + char *p = strchr( val.psz_string, ':' ); + p_sys->param.i_deblocking_filter_alphac0 = atoi( val.psz_string ); + p_sys->param.i_deblocking_filter_beta = p ? atoi( p+1 ) : p_sys->param.i_deblocking_filter_alphac0; + 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; @@ -618,6 +840,17 @@ static int Open ( vlc_object_t *p_this ) if( val.b_bool ) p_sys->param.i_log_level = X264_LOG_DEBUG; #endif + 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; @@ -651,14 +884,16 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.i_scenecut_threshold = val.i_int; #endif -#if X264_BUILD >= 30 +#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 <= 6 ) - p_sys->param.analyse.i_subpel_refine = val.i_int; -#else - if( val.i_int >= 1 && val.i_int <= 5 ) + if( val.i_int >= 1 && val.i_int <= SUBME_MAX ) p_sys->param.analyse.i_subpel_refine = val.i_int; -#endif #if X264_BUILD >= 24 var_Get( p_enc, SOUT_CFG_PREFIX "me", &val ); @@ -681,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 ); @@ -698,11 +941,22 @@ static int Open ( vlc_object_t *p_this ) { p_sys->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_TEMPORAL; } +#if X264_BUILD >= 45 /* r457 */ + else if( !strcmp( val.psz_string, "auto" ) ) + { + p_sys->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO; + } +#endif if( 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; +#if X264_BUILD >= 50 /* r554 */ + var_Get( p_enc, SOUT_CFG_PREFIX "ssim", &val ); + p_sys->param.analyse.b_ssim = val.b_bool; +#endif + #if X264_BUILD >= 0x0012 var_Get( p_enc, SOUT_CFG_PREFIX "weightb", &val ); p_sys->param.analyse.b_weighted_bipred = val.b_bool; @@ -730,10 +984,19 @@ static int Open ( vlc_object_t *p_this ) #endif #if X264_BUILD >= 37 - var_Get( p_enc, SOUT_CFG_PREFIX "crf", &val ); - if( val.i_int >= 0 && val.i_int <= 51 ) /* crf != 0 overrides qp */ + 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 + } +#endif #if X264_BUILD >= 39 var_Get( p_enc, SOUT_CFG_PREFIX "trellis", &val ); @@ -758,7 +1021,27 @@ static int Open ( vlc_object_t *p_this ) #if X264_BUILD >= 44 var_Get( p_enc, SOUT_CFG_PREFIX "nr", &val ); - p_sys->param.analyse.i_noise_reduction = val.i_int; + if( val.i_int >= 0 && val.i_int <= 1000 ) + p_sys->param.analyse.i_noise_reduction = val.i_int; +#endif + +#if X264_BUILD >= 46 + var_Get( p_enc, SOUT_CFG_PREFIX "dct-decimate", &val ); + 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 ); @@ -767,7 +1050,7 @@ static int Open ( vlc_object_t *p_this ) #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; @@ -816,7 +1099,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; @@ -831,28 +1114,48 @@ 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) ) + + unsigned i_cpu = vlc_CPU(); + if( !(i_cpu & CPU_CAPABILITY_MMX) ) { p_sys->param.cpu &= ~X264_CPU_MMX; } - if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) ) + if( !(i_cpu & CPU_CAPABILITY_MMXEXT) ) { p_sys->param.cpu &= ~X264_CPU_MMXEXT; } - if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) ) + if( !(i_cpu & CPU_CAPABILITY_SSE) ) { p_sys->param.cpu &= ~X264_CPU_SSE; } - if( !(p_enc->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) ) + if( !(i_cpu & CPU_CAPABILITY_SSE2) ) { p_sys->param.cpu &= ~X264_CPU_SSE2; } #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; #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 ); @@ -865,7 +1168,6 @@ static int Open ( vlc_object_t *p_this ) p_enc->fmt_out.i_extra = 0; p_enc->fmt_out.p_extra = NULL; -#if 0 x264_encoder_headers( p_sys->h, &nal, &i_nal ); for( i = 0; i < i_nal; i++ ) { @@ -880,7 +1182,6 @@ static int Open ( vlc_object_t *p_this ) p_enc->fmt_out.i_extra += i_size; } -#endif return VLC_SUCCESS; } @@ -972,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 );