X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fx264.c;h=96cdf3d4c6772260e5cb4ac7598bf924c82fac8c;hb=2a70bf3485b7c8ae409b5fbc73655713a1ef440b;hp=507244670125d919b26ca8d14d7317b0a8d0403d;hpb=9a76e73836c7c15c8e2d9039474495048bf4bc4f;p=vlc diff --git a/modules/codec/x264.c b/modules/codec/x264.c index 5072446701..96cdf3d4c6 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -42,6 +42,8 @@ #endif #include +#include + #define SOUT_CFG_PREFIX "sout-x264-" /***************************************************************************** @@ -67,6 +69,19 @@ static void Close( vlc_object_t * ); "If scenecuts appear within this interval, they are still encoded as " \ "I-frames, but do not start a new GOP." ) +#define OPENGOP_TEXT N_("Use recovery points to close GOPs") +#if X264_BUILD < 115 +#define OPENGOP_LONGTEXT N_("none: use closed GOPs only\n"\ + "normal: use standard open GOPs\n" \ + "bluray: use Blu-ray compatible open GOPs" ) +#else +#define OPENGOP_LONGTEXT N_("use open GOP, for bluray compatibility use also bluray-compat option") +#endif + +#define BLURAY_TEXT N_("Enable compatibility hacks for Blu-ray support") +#define BLURAY_LONGTEXT N_("Enable hacks for Blu-ray support, this doesn't enforce every aspect of Blu-ray compatibility\n" \ + "e.g. resolution, framerate, level" ) + #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 " \ @@ -120,7 +135,7 @@ 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 " \ @@ -128,7 +143,7 @@ static void Close( vlc_object_t * ); "(10 to 51 is also allowed). Set to 0 for letting x264 set level.") #define PROFILE_TEXT N_("H.264 profile") -#define PROFILE_LONGTEXT N_("Specify H.264 profile which limits are enforced over" \ +#define PROFILE_LONGTEXT N_("Specify H.264 profile which limits are enforced over " \ "other settings" ) /* In order to play an interlaced output stream encoded by x264, a decoder needs @@ -144,7 +159,7 @@ static void Close( vlc_object_t * ); #define MBTREE_LONGTEXT N_("You can disable use of Macroblock-tree on ratecontrol") #define SLICE_COUNT N_("Force number of slices per frame") -#define SLICE_COUNT_LONGTEXT N_("Force rectangular slices and is overridden by other slicing optinos") +#define SLICE_COUNT_LONGTEXT N_("Force rectangular slices and is overridden by other slicing options") #define SLICE_MAX_SIZE N_("Limit the size of each slice in bytes") #define SLICE_MAX_SIZE_LONGTEXT N_("Sets a maximum slice size in bytes, Includes NAL overhead in size") @@ -194,7 +209,7 @@ static void Close( vlc_object_t * ); #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"\ + "and textured areas, default 1.0 recommended to be between 0..2\n"\ " - 0.5: weak AQ\n"\ " - 1.5: strong AQ") @@ -223,7 +238,7 @@ static void Close( vlc_object_t * ); "before curve compression. Temporally blurs complexity.") #define QBLUR_TEXT N_("Reduce fluctuations in QP") -#define QBLUR_LONGTEXT N_( "This reduces the fluctations in QP " \ +#define QBLUR_LONGTEXT N_( "This reduces the fluctuations in QP " \ "after curve compression. Temporally blurs quants.") /* Analysis */ @@ -278,8 +293,8 @@ static void Close( vlc_object_t * ); "-1 is automatic, based on number of threads." ) #define PSY_RD_TEXT N_( "Strength of psychovisual optimization, default is \"1.0:0.0\"") -#define PSY_RD_LONGTEXT N_( "First parameter controls if RD is on (subme>=6) or off"\ - "second parameter controls if Trellis is used on psychovisual optimization," \ +#define PSY_RD_LONGTEXT N_( "First parameter controls if RD is on (subme>=6) or off.\n"\ + "Second parameter controls if Trellis is used on psychovisual optimization, " \ "default off") #define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \ @@ -359,7 +374,6 @@ static void Close( vlc_object_t * ); "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.") @@ -373,8 +387,7 @@ static void Close( vlc_object_t * ); #define LOOKAHEAD_TEXT N_("Framecount to use on frametype lookahead") #define LOOKAHEAD_LONGTEXT N_("Framecount to use on frametype lookahead. " \ - "Currently default is lower than x264 default because unmuxable output" \ - "doesn't handle larger values that well yet" ) + "Currently default can cause sync-issues on unmuxable output, like rtsp-output without ts-mux" ) #define HRD_TEXT N_("HRD-timing information") #define HRD_LONGTEXT N_("HRD-timing information") @@ -413,261 +426,272 @@ vlc_module_begin () /* Frame-type options */ - add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT, + add_integer( SOUT_CFG_PREFIX "keyint", 250, KEYINT_TEXT, KEYINT_LONGTEXT, false ) - add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT, - MIN_KEYINT_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "min-keyint", 25, MIN_KEYINT_TEXT, + MIN_KEYINT_LONGTEXT, true ) + +#if X264_BUILD >= 102 && X264_BUILD <= 114 + add_string( SOUT_CFG_PREFIX "opengop", "none", OPENGOP_TEXT, + OPENGOP_LONGTEXT, true ) + change_string_list( x264_open_gop_names, x264_open_gop_names, 0 ); +#elif X264_BUILD > 114 + add_bool( SOUT_CFG_PREFIX "opengop", false, OPENGOP_TEXT, + OPENGOP_LONGTEXT, true ) + add_bool( SOUT_CFG_PREFIX "bluray-compat", false, BLURAY_TEXT, + BLURAY_LONGTEXT, true ) +#endif - add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT, - SCENE_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "scenecut", 40, SCENE_TEXT, + SCENE_LONGTEXT, true ) change_integer_range( -1, 100 ) add_obsolete_bool( SOUT_CFG_PREFIX "pre-scenecut" ) - add_integer( SOUT_CFG_PREFIX "bframes", 3, NULL, BFRAMES_TEXT, - BFRAMES_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "bframes", 3, BFRAMES_TEXT, + BFRAMES_LONGTEXT, true ) change_integer_range( 0, 16 ) - add_integer( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT, - B_ADAPT_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "b-adapt", 1, B_ADAPT_TEXT, + B_ADAPT_LONGTEXT, true ) change_integer_range( 0, 2 ) - add_integer( SOUT_CFG_PREFIX "b-bias", 0, NULL, B_BIAS_TEXT, - B_BIAS_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "b-bias", 0, B_BIAS_TEXT, + B_BIAS_LONGTEXT, true ) change_integer_range( -100, 100 ) #if X264_BUILD >= 87 - add_string( SOUT_CFG_PREFIX "bpyramid", "normal", NULL, BPYRAMID_TEXT, - BPYRAMID_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "bpyramid", "normal", BPYRAMID_TEXT, + BPYRAMID_LONGTEXT, true ) #else - add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT, - BPYRAMID_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "bpyramid", "none", BPYRAMID_TEXT, + BPYRAMID_LONGTEXT, true ) #endif change_string_list( bpyramid_list, bpyramid_list, 0 ); - add_bool( SOUT_CFG_PREFIX "cabac", true, NULL, CABAC_TEXT, CABAC_LONGTEXT, - false ) + add_bool( SOUT_CFG_PREFIX "cabac", true, CABAC_TEXT, CABAC_LONGTEXT, + true ) - add_integer( SOUT_CFG_PREFIX "ref", 3, NULL, REF_TEXT, - REF_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "ref", 3, REF_TEXT, + REF_LONGTEXT, true ) change_integer_range( 1, 16 ) - add_bool( SOUT_CFG_PREFIX "nf", false, NULL, NF_TEXT, - NF_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "nf", false, NF_TEXT, + NF_LONGTEXT, true ) - add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT, - FILTER_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "deblock", "0:0", FILTER_TEXT, + FILTER_LONGTEXT, true ) - add_string( SOUT_CFG_PREFIX "psy-rd", "1.0:0.0", NULL, PSY_RD_TEXT, - PSY_RD_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "psy-rd", "1.0:0.0", PSY_RD_TEXT, + PSY_RD_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "psy", true, NULL, PSY_TEXT, PSY_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "psy", true, PSY_TEXT, PSY_LONGTEXT, true ) - add_string( SOUT_CFG_PREFIX "level", "0", NULL, LEVEL_TEXT, + add_string( SOUT_CFG_PREFIX "level", "0", LEVEL_TEXT, LEVEL_LONGTEXT, false ) - add_string( SOUT_CFG_PREFIX "profile", "high", NULL, PROFILE_TEXT, + add_string( SOUT_CFG_PREFIX "profile", "high", PROFILE_TEXT, PROFILE_LONGTEXT, false ) change_string_list( x264_profile_names, x264_profile_names, 0 ); - add_bool( SOUT_CFG_PREFIX "interlaced", false, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT, - false ) + add_bool( SOUT_CFG_PREFIX "interlaced", false, INTERLACED_TEXT, INTERLACED_LONGTEXT, + true ) - add_integer( SOUT_CFG_PREFIX "slices", 0, NULL, SLICE_COUNT, SLICE_COUNT_LONGTEXT, false ) - add_integer( SOUT_CFG_PREFIX "slice-max-size", 0, NULL, SLICE_MAX_SIZE, SLICE_MAX_SIZE_LONGTEXT, false ) - add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, NULL, SLICE_MAX_MBS, SLICE_MAX_MBS_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "slices", 0, SLICE_COUNT, SLICE_COUNT_LONGTEXT, true ) + add_integer( SOUT_CFG_PREFIX "slice-max-size", 0, SLICE_MAX_SIZE, SLICE_MAX_SIZE_LONGTEXT, true ) + add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, SLICE_MAX_MBS, SLICE_MAX_MBS_LONGTEXT, true ) #if X264_BUILD >= 89 - add_string( SOUT_CFG_PREFIX "hrd", "none", NULL, HRD_TEXT, HRD_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "hrd", "none", HRD_TEXT, HRD_LONGTEXT, true ) change_string_list( x264_nal_hrd_names, x264_nal_hrd_names, 0 ); #endif /* Ratecontrol */ - add_integer( SOUT_CFG_PREFIX "qp", -1, NULL, QP_TEXT, QP_LONGTEXT, - false ) + add_integer( SOUT_CFG_PREFIX "qp", -1, QP_TEXT, QP_LONGTEXT, + true ) change_integer_range( -1, 51 ) /* QP 0 -> lossless encoding */ - add_integer( SOUT_CFG_PREFIX "crf", 23, NULL, CRF_TEXT, - CRF_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "crf", 23, CRF_TEXT, + CRF_LONGTEXT, true ) change_integer_range( 0, 51 ) - add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT, - QPMIN_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "qpmin", 10, QPMIN_TEXT, + QPMIN_LONGTEXT, true ) change_integer_range( 0, 51 ) - add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT, - QPMAX_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "qpmax", 51, QPMAX_TEXT, + QPMAX_LONGTEXT, true ) change_integer_range( 0, 51 ) - add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT, - QPSTEP_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "qpstep", 4, QPSTEP_TEXT, + QPSTEP_LONGTEXT, true ) change_integer_range( 0, 51 ) - add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT, - RATETOL_LONGTEXT, false ) + add_float( SOUT_CFG_PREFIX "ratetol", 1.0, RATETOL_TEXT, + RATETOL_LONGTEXT, true ) change_float_range( 0, 100 ) - add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT, - VBV_MAXRATE_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, VBV_MAXRATE_TEXT, + VBV_MAXRATE_LONGTEXT, true ) - add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, NULL, VBV_BUFSIZE_TEXT, - VBV_BUFSIZE_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, VBV_BUFSIZE_TEXT, + VBV_BUFSIZE_LONGTEXT, true ) - add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT, - VBV_INIT_LONGTEXT, false ) + add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, VBV_INIT_TEXT, + VBV_INIT_LONGTEXT, true ) change_float_range( 0, 1 ) - add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT, - IPRATIO_LONGTEXT, false ) + add_float( SOUT_CFG_PREFIX "ipratio", 1.40, IPRATIO_TEXT, + IPRATIO_LONGTEXT, true ) change_float_range( 1, 2 ) - add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT, - PBRATIO_LONGTEXT, false ) + add_float( SOUT_CFG_PREFIX "pbratio", 1.30, PBRATIO_TEXT, + PBRATIO_LONGTEXT, true ) change_float_range( 1, 2 ) - add_integer( SOUT_CFG_PREFIX "chroma-qp-offset", 0, NULL, CHROMA_QP_OFFSET_TEXT, - CHROMA_QP_OFFSET_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "chroma-qp-offset", 0, CHROMA_QP_OFFSET_TEXT, + CHROMA_QP_OFFSET_LONGTEXT, true ) - add_integer( SOUT_CFG_PREFIX "pass", 0, NULL, PASS_TEXT, + add_integer( SOUT_CFG_PREFIX "pass", 0, PASS_TEXT, PASS_LONGTEXT, false ) change_integer_range( 0, 3 ) - add_float( SOUT_CFG_PREFIX "qcomp", 0.60, NULL, QCOMP_TEXT, - QCOMP_LONGTEXT, false ) + add_float( SOUT_CFG_PREFIX "qcomp", 0.60, QCOMP_TEXT, + QCOMP_LONGTEXT, true ) change_float_range( 0, 1 ) - add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, NULL, CPLXBLUR_TEXT, - CPLXBLUR_LONGTEXT, false ) + add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, CPLXBLUR_TEXT, + CPLXBLUR_LONGTEXT, true ) - add_float( SOUT_CFG_PREFIX "qblur", 0.5, NULL, QBLUR_TEXT, - QBLUR_LONGTEXT, false ) + add_float( SOUT_CFG_PREFIX "qblur", 0.5, QBLUR_TEXT, + QBLUR_LONGTEXT, true ) - add_integer( SOUT_CFG_PREFIX "aq-mode", X264_AQ_VARIANCE, NULL, AQ_MODE_TEXT, - AQ_MODE_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "aq-mode", X264_AQ_VARIANCE, AQ_MODE_TEXT, + AQ_MODE_LONGTEXT, true ) change_integer_range( 0, 2 ) - add_float( SOUT_CFG_PREFIX "aq-strength", 1.0, NULL, AQ_STRENGTH_TEXT, - AQ_STRENGTH_LONGTEXT, false ) + add_float( SOUT_CFG_PREFIX "aq-strength", 1.0, AQ_STRENGTH_TEXT, + AQ_STRENGTH_LONGTEXT, true ) /* Analysis */ /* x264 partitions = none (default). set at least "normal" mode. */ - add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT, - ANALYSE_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "partitions", "normal", ANALYSE_TEXT, + ANALYSE_LONGTEXT, true ) change_string_list( enc_analyse_list, enc_analyse_list_text, 0 ); - add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT, - DIRECT_PRED_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "direct", "spatial", DIRECT_PRED_TEXT, + DIRECT_PRED_LONGTEXT, true ) change_string_list( direct_pred_list, direct_pred_list_text, 0 ); - add_integer( SOUT_CFG_PREFIX "direct-8x8", 1, NULL, DIRECT_PRED_SIZE_TEXT, - DIRECT_PRED_SIZE_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "direct-8x8", 1, DIRECT_PRED_SIZE_TEXT, + DIRECT_PRED_SIZE_LONGTEXT, true ) change_integer_range( -1, 1 ) - add_bool( SOUT_CFG_PREFIX "weightb", true, NULL, WEIGHTB_TEXT, - WEIGHTB_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "weightb", true, WEIGHTB_TEXT, + WEIGHTB_LONGTEXT, true ) - add_integer( SOUT_CFG_PREFIX "weightp", 2, NULL, WEIGHTP_TEXT, - WEIGHTP_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "weightp", 2, WEIGHTP_TEXT, + WEIGHTP_LONGTEXT, true ) change_integer_range( 0, 2 ) - add_string( SOUT_CFG_PREFIX "me", "hex", NULL, ME_TEXT, - ME_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "me", "hex", ME_TEXT, + ME_LONGTEXT, true ) change_string_list( enc_me_list, enc_me_list_text, 0 ); - add_integer( SOUT_CFG_PREFIX "merange", 16, NULL, MERANGE_TEXT, - MERANGE_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "merange", 16, MERANGE_TEXT, + MERANGE_LONGTEXT, true ) change_integer_range( 1, 64 ) - add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT, - MVRANGE_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "mvrange", -1, MVRANGE_TEXT, + MVRANGE_LONGTEXT, true ) - add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT, - MVRANGE_THREAD_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, MVRANGE_THREAD_TEXT, + MVRANGE_THREAD_LONGTEXT, true ) - add_integer( SOUT_CFG_PREFIX "subme", 7, NULL, SUBME_TEXT, - SUBME_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "subme", 7, SUBME_TEXT, + SUBME_LONGTEXT, true ) add_obsolete_bool( SOUT_CFG_PREFIX "b-rdo" ) - add_bool( SOUT_CFG_PREFIX "mixed-refs", true, NULL, MIXED_REFS_TEXT, - MIXED_REFS_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "mixed-refs", true, MIXED_REFS_TEXT, + MIXED_REFS_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "chroma-me", true, NULL, CHROMA_ME_TEXT, - CHROMA_ME_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "chroma-me", true, CHROMA_ME_TEXT, + CHROMA_ME_LONGTEXT, true ) add_obsolete_bool( SOUT_CFG_PREFIX "bime" ) - add_bool( SOUT_CFG_PREFIX "8x8dct", true, NULL, TRANSFORM_8X8DCT_TEXT, - TRANSFORM_8X8DCT_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "8x8dct", true, TRANSFORM_8X8DCT_TEXT, + TRANSFORM_8X8DCT_LONGTEXT, true ) - add_integer( SOUT_CFG_PREFIX "trellis", 1, NULL, TRELLIS_TEXT, - TRELLIS_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "trellis", 1, TRELLIS_TEXT, + TRELLIS_LONGTEXT, true ) change_integer_range( 0, 2 ) - add_integer( SOUT_CFG_PREFIX "lookahead", 5, NULL, LOOKAHEAD_TEXT, - LOOKAHEAD_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "lookahead", 40, LOOKAHEAD_TEXT, + LOOKAHEAD_LONGTEXT, true ) change_integer_range( 0, 60 ) - add_bool( SOUT_CFG_PREFIX "intra-refresh", false, NULL, INTRAREFRESH_TEXT, - INTRAREFRESH_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "intra-refresh", false, INTRAREFRESH_TEXT, + INTRAREFRESH_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "mbtree", true, NULL, MBTREE_TEXT, MBTREE_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "mbtree", true, MBTREE_TEXT, MBTREE_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "fast-pskip", true, NULL, FAST_PSKIP_TEXT, - FAST_PSKIP_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "fast-pskip", true, FAST_PSKIP_TEXT, + FAST_PSKIP_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "dct-decimate", true, NULL, DCT_DECIMATE_TEXT, - DCT_DECIMATE_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "dct-decimate", true, DCT_DECIMATE_TEXT, + DCT_DECIMATE_LONGTEXT, true ) - add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT, - NR_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "nr", 0, NR_TEXT, + NR_LONGTEXT, true ) change_integer_range( 0, 1000 ) - add_integer( SOUT_CFG_PREFIX "deadzone-inter", 21, NULL, DEADZONE_INTER_TEXT, - DEADZONE_INTRA_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "deadzone-inter", 21, DEADZONE_INTER_TEXT, + DEADZONE_INTRA_LONGTEXT, true ) change_integer_range( 0, 32 ) - add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, NULL, DEADZONE_INTRA_TEXT, - DEADZONE_INTRA_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, DEADZONE_INTRA_TEXT, + DEADZONE_INTRA_LONGTEXT, true ) change_integer_range( 0, 32 ) /* Input/Output */ - add_bool( SOUT_CFG_PREFIX "non-deterministic", false, NULL, NON_DETERMINISTIC_TEXT, - NON_DETERMINISTIC_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "non-deterministic", false, NON_DETERMINISTIC_TEXT, + NON_DETERMINISTIC_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "asm", true, NULL, ASM_TEXT, - ASM_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "asm", true, ASM_TEXT, + ASM_LONGTEXT, true ) /* x264 psnr = 1 (default). disable PSNR computation for speed. */ - add_bool( SOUT_CFG_PREFIX "psnr", false, NULL, PSNR_TEXT, - PSNR_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "psnr", false, PSNR_TEXT, + PSNR_LONGTEXT, true ) /* x264 ssim = 1 (default). disable SSIM computation for speed. */ - add_bool( SOUT_CFG_PREFIX "ssim", false, NULL, SSIM_TEXT, - SSIM_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "ssim", false, SSIM_TEXT, + SSIM_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "quiet", false, NULL, QUIET_TEXT, - QUIET_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "quiet", false, QUIET_TEXT, + QUIET_TEXT, true ) - add_integer( SOUT_CFG_PREFIX "sps-id", 0, NULL, SPS_ID_TEXT, - SPS_ID_LONGTEXT, false ) + add_integer( SOUT_CFG_PREFIX "sps-id", 0, SPS_ID_TEXT, + SPS_ID_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "aud", false, NULL, AUD_TEXT, - AUD_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "aud", false, AUD_TEXT, + AUD_LONGTEXT, true ) - add_bool( SOUT_CFG_PREFIX "verbose", false, NULL, VERBOSE_TEXT, - VERBOSE_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "verbose", false, VERBOSE_TEXT, + VERBOSE_LONGTEXT, true ) - add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT, - STATS_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", STATS_TEXT, + STATS_LONGTEXT, true ) - add_string( SOUT_CFG_PREFIX "preset", NULL , NULL, PRESET_TEXT , PRESET_TEXT, false ) + add_string( SOUT_CFG_PREFIX "preset", NULL , PRESET_TEXT , PRESET_TEXT, false ) change_string_list( x264_preset_names, x264_preset_names, 0 ); - add_string( SOUT_CFG_PREFIX "tune", NULL , NULL, TUNE_TEXT, TUNE_TEXT, false ) + add_string( SOUT_CFG_PREFIX "tune", NULL , TUNE_TEXT, TUNE_TEXT, false ) change_string_list( x264_tune_names, x264_tune_names, 0 ); vlc_module_end () @@ -689,7 +713,7 @@ static const char *const ppsz_sout_options[] = { "verbose", "vbv-bufsize", "vbv-init", "vbv-maxrate", "weightb", "weightp", "aq-mode", "aq-strength", "psy-rd", "psy", "profile", "lookahead", "slices", "slice-max-size", "slice-max-mbs", "intra-refresh", "mbtree", "hrd", - "tune","preset", NULL + "tune","preset", "opengop", "bluray-compat", NULL }; static block_t *Encode( encoder_t *, picture_t * ); @@ -699,9 +723,11 @@ struct encoder_sys_t x264_t *h; x264_param_t param; - int i_initial_delay; + mtime_t i_initial_delay; - char *psz_stat_name; + char *psz_stat_name; + int i_sei_size; + uint8_t *p_sei; }; #ifdef PTW32_STATIC_LIB @@ -743,6 +769,8 @@ static int Open ( vlc_object_t *p_this ) return VLC_ENOMEM; p_sys->i_initial_delay = 0; p_sys->psz_stat_name = NULL; + p_sys->i_sei_size = 0; + p_sys->p_sei = NULL; x264_param_default( &p_sys->param ); char *psz_preset = var_GetString( p_enc, SOUT_CFG_PREFIX "preset" ); @@ -823,7 +851,7 @@ static int Open ( vlc_object_t *p_this ) else if ( i_val ) p_sys->param.rc.i_vbv_max_bitrate = i_val; - + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) ) p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ); @@ -900,6 +928,19 @@ static int Open ( vlc_object_t *p_this ) i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "min-keyint" ); if( i_val > 0 && i_val != 25 ) p_sys->param.i_keyint_min = i_val; +#if X264_BUILD >= 102 && X264_BUILD <= 114 + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "opengop" ); + if( !strcmp( psz_val, "none" ) ) + p_sys->param.i_open_gop = X264_OPEN_GOP_NONE; + else if( !strcmp( psz_val, "normal" ) ) + p_sys->param.i_open_gop = X264_OPEN_GOP_NORMAL; + else if( !strcmp( psz_val, "bluray" ) ) + p_sys->param.i_open_gop = X264_OPEN_GOP_BLURAY; + free( psz_val ); +#elif X264_BUILD >= 115 + p_sys->param.b_open_gop = var_GetBool( p_enc, SOUT_CFG_PREFIX "opengop" ); + p_sys->param.b_bluray_compat = var_GetBool( p_enc, SOUT_CFG_PREFIX "bluray-compat" ); +#endif i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "bframes" ); if( i_val >= 0 && i_val <= 16 && i_val != 3 ) p_sys->param.i_bframe = i_val; @@ -999,7 +1040,7 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.analyse.b_psnr = var_GetBool( p_enc, SOUT_CFG_PREFIX "psnr" ); p_sys->param.analyse.b_ssim = var_GetBool( p_enc, SOUT_CFG_PREFIX "ssim" ); - if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "weightb" ) ) + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "weightb" ) ) p_sys->param.analyse.b_weighted_bipred = var_GetBool( p_enc, SOUT_CFG_PREFIX "weightb" ); if( var_GetInteger( p_enc, SOUT_CFG_PREFIX "weightp" ) != 2 ) @@ -1151,7 +1192,6 @@ static int Open ( vlc_object_t *p_this ) { msg_Dbg( p_enc, "Limiting to main-profile"); p_sys->param.analyse.b_transform_8x8 = 0; - p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE; } /* high profile don't restrict stuff*/ } @@ -1198,7 +1238,7 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.rc.b_stat_read = i_val & 2; } - if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) ) + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) ) p_sys->param.rc.b_mb_tree = var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ); /* We need to initialize pthreadw32 before we open the encoder, @@ -1222,10 +1262,13 @@ static int Open ( vlc_object_t *p_this ) vlc_mutex_unlock( &pthread_win32_mutex ); #endif - /* Set lookahead value to lower than default, - * as rtp-output without mux doesn't handle - * difference that well yet*/ - p_sys->param.rc.i_lookahead= var_GetInteger( p_enc, SOUT_CFG_PREFIX "lookahead" ); + if( var_GetInteger( p_enc, SOUT_CFG_PREFIX "lookahead" ) != 40 ) + { + p_sys->param.rc.i_lookahead = var_GetInteger( p_enc, SOUT_CFG_PREFIX "lookahead" ); + } + + /* We don't want repeated headers, we repeat p_extra ourself if needed */ + p_sys->param.b_repeat_headers = 0; /* Open the encoder */ p_sys->h = x264_encoder_open( &p_sys->param ); @@ -1238,23 +1281,43 @@ static int Open ( vlc_object_t *p_this ) } /* get the globals headers */ - p_enc->fmt_out.i_extra = 0; - p_enc->fmt_out.p_extra = NULL; - - p_enc->fmt_out.i_extra = x264_encoder_headers( p_sys->h, &nal, &i_nal ); - p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra ); - if( !p_enc->fmt_out.p_extra ) + size_t i_extra = x264_encoder_headers( p_sys->h, &nal, &i_nal ); + uint8_t *p_extra = p_enc->fmt_out.p_extra = malloc( i_extra ); + if( !p_extra ) { Close( VLC_OBJECT(p_enc) ); return VLC_ENOMEM; } - uint8_t *p_tmp = p_enc->fmt_out.p_extra; + for( i = 0; i < i_nal; i++ ) { - memcpy( p_tmp, nal[i].p_payload, nal[i].i_payload ); - p_tmp += nal[i].i_payload; + if( nal[i].i_type != NAL_SEI ) + { + memcpy( p_extra, nal[i].p_payload, nal[i].i_payload ); + p_extra += nal[i].i_payload; + continue; /* next NAL */ + } + + /* we won't store this NAL in p_extra */ + assert( i_extra >= (size_t)nal[i].i_payload ); + i_extra -= nal[i].i_payload; + + /* Make sure we only have one SEI NAL in the headers */ + assert(p_sys->i_sei_size == 0); + p_sys->i_sei_size = nal[i].i_payload; + + p_sys->p_sei = malloc( p_sys->i_sei_size ); + if( !p_sys->p_sei ) + { + free( p_extra ); + Close( VLC_OBJECT(p_enc) ); + return VLC_ENOMEM; + } + memcpy( p_sys->p_sei, nal[i].p_payload, nal[i].i_payload ); } + p_enc->fmt_out.i_extra = i_extra; + return VLC_SUCCESS; } @@ -1270,9 +1333,19 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) int i_nal=0, i_out=0, i=0; /* init pic */ +#if X264_BUILD >= 98 + x264_picture_init( &pic ); +#else memset( &pic, 0, sizeof( x264_picture_t ) ); +#endif if( likely(p_pict) ) { pic.i_pts = p_pict->date; + /* scale pts starting from 0 as libx264 seems to return dts values + assume that + */ + if( unlikely( p_sys->i_initial_delay == 0 ) ) + p_sys->i_initial_delay = p_pict->date; + pic.i_pts -= p_sys->i_initial_delay; pic.img.i_csp = X264_CSP_I420; pic.img.i_plane = p_pict->i_planes; for( i = 0; i < p_pict->i_planes; i++ ) @@ -1292,18 +1365,24 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) /* Get size of block we need */ - for( i = 0, i_out = 0; i < i_nal; i++ ) + for( i = 0; i < i_nal; i++ ) i_out += nal[i].i_payload; - p_block = block_New( p_enc, i_out ); + p_block = block_New( p_enc, i_out + p_sys->i_sei_size ); if( !p_block ) return NULL; - /* copy encoded data directly to block */ - for( i = 0, i_out = 0; i < i_nal; i++ ) + unsigned int i_offset = 0; + if( unlikely( p_sys->i_sei_size ) ) { - memcpy( p_block->p_buffer + i_out, nal[i].p_payload, nal[i].i_payload ); - i_out += nal[i].i_payload; + /* insert x264 headers SEI nal into the first picture block at the start */ + memcpy( p_block->p_buffer, p_sys->p_sei, p_sys->i_sei_size ); + i_offset = p_sys->i_sei_size; + p_sys->i_sei_size = 0; + free( p_sys->p_sei ); + p_sys->p_sei = NULL; } + /* copy encoded data directly to block */ + memcpy( p_block->p_buffer + i_offset, nal[0].p_payload, i_out ); if( pic.b_keyframe ) p_block->i_flags |= BLOCK_FLAG_TYPE_I; @@ -1319,16 +1398,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) p_enc->fmt_in.video.i_frame_rate_base / p_enc->fmt_in.video.i_frame_rate; - /* libx264 gives pts/dts values from >= 83 onward, - * also pts starts from 0 so dts can be negative, - * but vlc doesn't handle if dts is < VLC_TS_0 so we - * use that offset to get it right for vlc. - */ - if( p_sys->i_initial_delay == 0 && pic.i_dts < VLC_TS_0 ) - { - p_sys->i_initial_delay = -1* pic.i_dts; - msg_Dbg( p_enc, "Initial delay is set to %d", p_sys->i_initial_delay ); - } + /* scale pts-values back*/ p_block->i_pts = pic.i_pts + p_sys->i_initial_delay; p_block->i_dts = pic.i_dts + p_sys->i_initial_delay; @@ -1344,6 +1414,7 @@ static void Close( vlc_object_t *p_this ) encoder_sys_t *p_sys = p_enc->p_sys; free( p_sys->psz_stat_name ); + free( p_sys->p_sei ); msg_Dbg( p_enc, "framecount still in libx264 buffer: %d", x264_encoder_delayed_frames( p_sys->h ) );