X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fx264.c;h=972597ce8477c2e8717db207c4ce8ae45808af61;hb=018de320fa70078984c2744b4f994467d8a7c4dd;hp=c2c1b4d6bc228c1f4efc94aa40a578b1bb9d6a8c;hpb=be5d9107a6ba2160a0baa5ea51fc3c121265d5d2;p=vlc diff --git a/modules/codec/x264.c b/modules/codec/x264.c index c2c1b4d6bc..972597ce84 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -1,10 +1,11 @@ /***************************************************************************** * x264.c: h264 video encoder ***************************************************************************** - * Copyright (C) 2004-2006 the VideoLAN team + * Copyright (C) 2004-2010 the VideoLAN team * $Id$ * * Authors: Laurent Aimar + * Ilkka Ollakka * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,6 +35,7 @@ #include #include #include +#include #ifdef PTW32_STATIC_LIB #include @@ -76,34 +78,29 @@ 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 */ && X264_BUILD < 67 /* r1117 */ -#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." ) #define B_ADAPT_TEXT N_("Adaptive B-frame decision") -#if X264_BUILD >= 63 #define B_ADAPT_LONGTEXT N_( "Force the specified number of " \ "consecutive B-frames to be used, except possibly before an I-frame." \ "Range 0 to 2." ) -#else -#define B_ADAPT_LONGTEXT N_( "Force the specified number of " \ - "consecutive B-frames to be used, except possibly before an I-frame." ) -#endif #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." ) + #define BPYRAMID_TEXT N_("Keep some B-frames as references") #define BPYRAMID_LONGTEXT N_( "Allows B-frames to be used as references for " \ "predicting other frames. Keeps the middle of 2+ consecutive B-frames " \ - "as a reference, and reorders frame appropriately." ) + "as a reference, and reorders frame appropriately.\n" \ + " - none: Disabled\n" \ + " - strict: Strictly hierarchical pyramid\n" \ + " - normal: Non-strict (not Blu-ray compatible)\n"\ + ) #define CABAC_TEXT N_("CABAC") #define CABAC_LONGTEXT N_( "CABAC (Context-Adaptive Binary Arithmetic "\ @@ -128,7 +125,7 @@ static void Close( vlc_object_t * ); #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).") + "(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" \ @@ -137,11 +134,23 @@ static void Close( vlc_object_t * ); /* 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 +#define INTRAREFRESH_TEXT N_("Use Periodic Intra Refresh") +#define INTRAREFRESH_LONGTEXT N_("Use Periodic Intra Refresh instead of IDR frames") + +#define MBTREE_TEXT N_("Use mb-tree ratecontrol") +#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_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") + +#define SLICE_MAX_MBS N_("Limit the size of each slice in macroblocks") +#define SLICE_MAX_MBS_LONGTEXT N_("Sets a maximum number of macroblocks per slice") /* Ratecontrol */ #define QP_TEXT N_("Set QP") @@ -177,7 +186,6 @@ 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 1\n" \ " - 0: Disabled\n"\ @@ -189,7 +197,6 @@ static void Close( vlc_object_t * ); "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") @@ -233,34 +240,29 @@ static void Close( vlc_object_t * ); #define DIRECT_PRED_TEXT N_("Direct MV prediction mode") #define DIRECT_PRED_LONGTEXT N_( "Direct MV prediction mode.") -#if X264_BUILD >= 52 /* r573 */ #define DIRECT_PRED_SIZE_TEXT N_("Direct prediction size") #define DIRECT_PRED_SIZE_LONGTEXT N_( "Direct prediction size: "\ " - 0: 4x4\n" \ " - 1: 8x8\n" \ " - -1: smallest possible according to level\n" ) -#endif #define WEIGHTB_TEXT N_("Weighted prediction for B-frames") #define WEIGHTB_LONGTEXT N_( "Weighted prediction for B-frames.") +#define WEIGHTP_TEXT N_("Weighted prediction for P-frames") +#define WEIGHTP_LONGTEXT N_(" Weighted prediction for P-frames: "\ + " - 0: Disabled\n"\ + " - 1: Blind offset\n"\ + " - 2: Smart analysis\n" ) + #define ME_TEXT N_("Integer pixel motion estimation method") -#if X264_BUILD >= 58 /* r728 */ #define ME_LONGTEXT N_( "Selects the motion estimation algorithm: "\ " - dia: diamond search, radius 1 (fast)\n" \ " - hex: hexagonal search, radius 2\n" \ " - umh: uneven multi-hexagon search (better but slower)\n" \ " - esa: exhaustive search (extremely slow, primarily for testing)\n" \ " - tesa: hadamard exhaustive search (extremely slow, primarily for testing)\n" ) -#else -#define ME_LONGTEXT N_( "Selects the motion estimation algorithm: "\ - " - dia: diamond search, radius 1 (fast)\n" \ - " - hex: hexagonal search, radius 2\n" \ - " - umh: uneven multi-hexagon search (better but slower)\n" \ - " - esa: exhaustive search (extremely slow, primarily for testing)\n" ) -#endif -#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). " \ @@ -270,44 +272,21 @@ static void Close( vlc_object_t * ); #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 -#if X264_BUILD >= 65 #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," \ "default off") -#endif #define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \ "quality") -#if X264_BUILD >= 65 -#define SUBME_MAX 9 #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 9." ) -#elif 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). Range 1 to 5." ) -#endif #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 " \ @@ -343,12 +322,14 @@ static void Close( vlc_object_t * ); #define DCT_DECIMATE_LONGTEXT N_( "Coefficient thresholding on P-frames." \ "Eliminate dct blocks containing only a small single coefficient.") +#define PSY_TEXT N_("Use Psy-optimizations") +#define PSY_LONGTEXT N_("Use all visual optimizations that can worsen both PSNR and SSIM") + /* 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. " \ "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." ) @@ -356,15 +337,12 @@ static void Close( vlc_object_t * ); #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.") @@ -386,48 +364,45 @@ static void Close( vlc_object_t * ); #define VERBOSE_TEXT N_("Statistics") #define VERBOSE_LONGTEXT N_( "Print stats for each frame.") -#if X264_BUILD >= 47 /* r518 */ #define SPS_ID_TEXT N_("SPS and PPS id numbers") #define SPS_ID_LONGTEXT N_( "Set SPS and PPS id numbers to allow concatenating " \ "streams with different settings.") -#endif #define AUD_TEXT N_("Access unit delimiters") #define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.") -#if X264_BUILD >= 24 && X264_BUILD < 58 -static const char *const enc_me_list[] = - { "dia", "hex", "umh", "esa" }; -static const char *const enc_me_list_text[] = - { N_("dia"), N_("hex"), N_("umh"), N_("esa") }; -#endif +#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" ) + +#define HRD_TEXT N_("HRD-timing information") +#define HRD_LONGTEXT N_("HRD-timing information") + +#define TUNE_TEXT N_("Tune the settings for a particular type of source or situation. " \ + "Overridden by user settings." ) +#define PRESET_TEXT N_("Use preset as default settings. Overridden by user settings." ) -#if X264_BUILD >= 58 /* r728 */ static const char *const enc_me_list[] = { "dia", "hex", "umh", "esa", "tesa" }; static const char *const enc_me_list_text[] = { N_("dia"), N_("hex"), N_("umh"), N_("esa"), N_("tesa") }; -#endif static const char *const profile_list[] = { "baseline", "main", "high" }; +static const char *const bpyramid_list[] = + { "none", "strict", "normal" }; + static const char *const enc_analyse_list[] = { "none", "fast", "normal", "slow", "all" }; 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 *const direct_pred_list[] = { "none", "spatial", "temporal", "auto" }; static const char *const direct_pred_list_text[] = { N_("none"), N_("spatial"), N_("temporal"), N_("auto") }; -#else -static const char *const direct_pred_list[] = - { "none", "spatial", "temporal" }; -static const char *const direct_pred_list_text[] = - { N_("none"), N_("spatial"), N_("temporal") }; -#endif vlc_module_begin () set_description( N_("H.264/MPEG4 AVC encoder (x264)")) @@ -443,42 +418,28 @@ vlc_module_begin () add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT, 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, false ) change_integer_range( -1, 100 ) -#if X264_BUILD >= 55 /* r607 */ -# if X264_BUILD < 67 /* r1117 */ - add_bool( SOUT_CFG_PREFIX "pre-scenecut", false, NULL, PRESCENE_TEXT, - PRESCENE_LONGTEXT, false ) -# else add_obsolete_bool( SOUT_CFG_PREFIX "pre-scenecut" ) -# endif -#endif add_integer( SOUT_CFG_PREFIX "bframes", 3, NULL, BFRAMES_TEXT, BFRAMES_LONGTEXT, false ) change_integer_range( 0, 16 ) -#if X264_BUILD >= 63 add_integer( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT, B_ADAPT_LONGTEXT, false ) change_integer_range( 0, 2 ) -#elif X264_BUILD >= 0x0013 /* r137 */ - add_bool( SOUT_CFG_PREFIX "b-adapt", true, NULL, B_ADAPT_TEXT, - B_ADAPT_LONGTEXT, false ) -#endif -#if X264_BUILD >= 0x0013 /* r137 */ add_integer( SOUT_CFG_PREFIX "b-bias", 0, NULL, B_BIAS_TEXT, B_BIAS_LONGTEXT, false ) change_integer_range( -100, 100 ) -#endif - add_bool( SOUT_CFG_PREFIX "bpyramid", false, NULL, BPYRAMID_TEXT, + add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT, BPYRAMID_LONGTEXT, false ) + change_string_list( bpyramid_list, bpyramid_list, 0 ); add_bool( SOUT_CFG_PREFIX "cabac", true, NULL, CABAC_TEXT, CABAC_LONGTEXT, false ) @@ -486,54 +447,55 @@ vlc_module_begin () add_integer( SOUT_CFG_PREFIX "ref", 3, NULL, REF_TEXT, 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", false, NULL, NF_TEXT, 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, false ) - add_deprecated_alias( SOUT_CFG_PREFIX "filter" ) /* Deprecated since 0.8.6 */ -#if X264_BUILD >= 65 add_string( SOUT_CFG_PREFIX "psy-rd", "1.0:0.0", NULL, PSY_RD_TEXT, PSY_RD_LONGTEXT, false ) -#endif - add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT, + add_bool( SOUT_CFG_PREFIX "psy", true, NULL, PSY_TEXT, PSY_LONGTEXT, false ) + + add_string( SOUT_CFG_PREFIX "level", "0", NULL, LEVEL_TEXT, LEVEL_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "profile", "high", NULL, PROFILE_TEXT, PROFILE_LONGTEXT, false ) - change_string_list( profile_list, profile_list, 0 ); + change_string_list( x264_profile_names, x264_profile_names, 0 ); -#if X264_BUILD >= 51 /* r570 */ add_bool( SOUT_CFG_PREFIX "interlaced", false, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT, false ) + + 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 ) + +#if X264_BUILD >= 89 + add_string( SOUT_CFG_PREFIX "hrd", "none", NULL, HRD_TEXT, HRD_LONGTEXT, false ) + 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 ) change_integer_range( -1, 51 ) /* QP 0 -> lossless encoding */ -#if X264_BUILD >= 37 /* r334 */ add_integer( SOUT_CFG_PREFIX "crf", 23, NULL, CRF_TEXT, CRF_LONGTEXT, false ) change_integer_range( 0, 51 ) -#endif add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT, 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, 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, false ) @@ -542,7 +504,6 @@ vlc_module_begin () add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT, 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, false ) @@ -562,10 +523,8 @@ vlc_module_begin () 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, false ) -#endif add_integer( SOUT_CFG_PREFIX "pass", 0, NULL, PASS_TEXT, PASS_LONGTEXT, false ) @@ -580,13 +539,12 @@ vlc_module_begin () add_float( SOUT_CFG_PREFIX "qblur", 0.5, NULL, QBLUR_TEXT, QBLUR_LONGTEXT, false ) -#if X264_BUILD >= 59 + add_integer( SOUT_CFG_PREFIX "aq-mode", X264_AQ_VARIANCE, 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 */ @@ -594,24 +552,22 @@ vlc_module_begin () add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT, 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, 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, false ) change_integer_range( -1, 1 ) -#endif -#if X264_BUILD >= 0x0012 /* r134 */ add_bool( SOUT_CFG_PREFIX "weightb", true, NULL, WEIGHTB_TEXT, WEIGHTB_LONGTEXT, false ) -#endif -#if X264_BUILD >= 24 /* r221 */ + add_integer( SOUT_CFG_PREFIX "weightp", 2, NULL, WEIGHTP_TEXT, + WEIGHTP_LONGTEXT, false ) + change_integer_range( 0, 2 ) + add_string( SOUT_CFG_PREFIX "me", "hex", NULL, ME_TEXT, ME_LONGTEXT, false ) change_string_list( enc_me_list, enc_me_list_text, 0 ); @@ -619,77 +575,52 @@ vlc_module_begin () add_integer( SOUT_CFG_PREFIX "merange", 16, NULL, MERANGE_TEXT, MERANGE_LONGTEXT, false ) change_integer_range( 1, 64 ) -#endif add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT, MVRANGE_LONGTEXT, false ) -#if X264_BUILD >= 55 /* r607 */ add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT, MVRANGE_THREAD_LONGTEXT, false ) -#endif - add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT, + add_integer( SOUT_CFG_PREFIX "subme", 7, NULL, SUBME_TEXT, 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 -# if X264_BUILD < 65 /* r368 */ - add_bool( SOUT_CFG_PREFIX "b-rdo", false, NULL, B_RDO_TEXT, - B_RDO_LONGTEXT, false ) -# else + add_obsolete_bool( SOUT_CFG_PREFIX "b-rdo" ) -# endif -#endif -#if X264_BUILD >= 36 /* r318 */ add_bool( SOUT_CFG_PREFIX "mixed-refs", true, NULL, MIXED_REFS_TEXT, MIXED_REFS_LONGTEXT, false ) -#endif -#if X264_BUILD >= 23 /* r171 */ add_bool( SOUT_CFG_PREFIX "chroma-me", true, NULL, CHROMA_ME_TEXT, CHROMA_ME_LONGTEXT, false ) -#endif -#if X264_BUILD >= 43 -# if X264_BUILD < 65 /* r390 */ - add_bool( SOUT_CFG_PREFIX "bime", false, NULL, BIME_TEXT, - BIME_LONGTEXT, false ) -# else add_obsolete_bool( SOUT_CFG_PREFIX "bime" ) -# endif -#endif -#if X264_BUILD >= 30 /* r251 */ - add_bool( SOUT_CFG_PREFIX "8x8dct", false, NULL, TRANSFORM_8X8DCT_TEXT, + add_bool( SOUT_CFG_PREFIX "8x8dct", true, NULL, TRANSFORM_8X8DCT_TEXT, TRANSFORM_8X8DCT_LONGTEXT, false ) -#endif -#if X264_BUILD >= 39 /* r360 */ add_integer( SOUT_CFG_PREFIX "trellis", 1, NULL, TRELLIS_TEXT, TRELLIS_LONGTEXT, false ) change_integer_range( 0, 2 ) -#endif -#if X264_BUILD >= 42 /* r384 */ + add_integer( SOUT_CFG_PREFIX "lookahead", 5, NULL, LOOKAHEAD_TEXT, + LOOKAHEAD_LONGTEXT, false ) + change_integer_range( 0, 60 ) + + add_bool( SOUT_CFG_PREFIX "intra-refresh", false, NULL, INTRAREFRESH_TEXT, + INTRAREFRESH_LONGTEXT, false ) + + add_bool( SOUT_CFG_PREFIX "mbtree", true, NULL, MBTREE_TEXT, MBTREE_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "fast-pskip", true, NULL, FAST_PSKIP_TEXT, FAST_PSKIP_LONGTEXT, false ) -#endif -#if X264_BUILD >= 46 /* r503 */ add_bool( SOUT_CFG_PREFIX "dct-decimate", true, NULL, DCT_DECIMATE_TEXT, DCT_DECIMATE_LONGTEXT, false ) -#endif -#if X264_BUILD >= 44 /* r398 */ add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT, 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, false ) change_integer_range( 0, 32 ) @@ -697,14 +628,11 @@ vlc_module_begin () add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, NULL, DEADZONE_INTRA_TEXT, DEADZONE_INTRA_LONGTEXT, false ) change_integer_range( 0, 32 ) -#endif /* Input/Output */ -#if X264_BUILD >= 55 /* r607 */ add_bool( SOUT_CFG_PREFIX "non-deterministic", false, NULL, NON_DETERMINISTIC_TEXT, NON_DETERMINISTIC_LONGTEXT, false ) -#endif add_bool( SOUT_CFG_PREFIX "asm", true, NULL, ASM_TEXT, ASM_LONGTEXT, false ) @@ -713,49 +641,50 @@ vlc_module_begin () add_bool( SOUT_CFG_PREFIX "psnr", false, NULL, PSNR_TEXT, PSNR_LONGTEXT, false ) -#if X264_BUILD >= 50 /* r554 */ /* x264 ssim = 1 (default). disable SSIM computation for speed. */ add_bool( SOUT_CFG_PREFIX "ssim", false, NULL, SSIM_TEXT, SSIM_LONGTEXT, false ) -#endif add_bool( SOUT_CFG_PREFIX "quiet", false, NULL, QUIET_TEXT, QUIET_LONGTEXT, false ) -#if X264_BUILD >= 47 /* r518 */ add_integer( SOUT_CFG_PREFIX "sps-id", 0, NULL, SPS_ID_TEXT, SPS_ID_LONGTEXT, false ) -#endif add_bool( SOUT_CFG_PREFIX "aud", false, NULL, AUD_TEXT, AUD_LONGTEXT, false ) -#if X264_BUILD >= 0x000e /* r81 */ add_bool( SOUT_CFG_PREFIX "verbose", false, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT, false ) -#endif add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT, STATS_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "preset", NULL , 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 ) + change_string_list( x264_tune_names, x264_tune_names, 0 ); + vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ static const char *const ppsz_sout_options[] = { - "8x8dct", "analyse", "asm", "aud", "bframes", "bime", "bpyramid", + "8x8dct", "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", + "deblock", "direct", "direct-8x8", "fast-pskip", + "interlaced", "ipratio", "keyint", "level", "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", "aq-mode", - "aq-strength", "psy-rd", "profile", NULL + "qpmin", "quiet", "ratetol", "ref", "scenecut", + "sps-id", "ssim", "stats", "subme", "trellis", + "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 }; static block_t *Encode( encoder_t *, picture_t * ); @@ -765,14 +694,16 @@ struct encoder_sys_t x264_t *h; x264_param_t param; - int i_buffer; - uint8_t *p_buffer; - - mtime_t i_interpolated_dts; + int i_initial_delay; char *psz_stat_name; }; +#ifdef PTW32_STATIC_LIB +static vlc_mutex_t pthread_win32_mutex = VLC_STATIC_MUTEX; +static int pthread_win32_count = 0; +#endif + /***************************************************************************** * Open: probe the encoder *****************************************************************************/ @@ -780,7 +711,8 @@ static int Open ( vlc_object_t *p_this ) { encoder_t *p_enc = (encoder_t *)p_this; encoder_sys_t *p_sys; - vlc_value_t val; + int i_val; + char *psz_val; int i_qmin = 0, i_qmax = 0; x264_nal_t *nal; int i, i_nal; @@ -790,30 +722,9 @@ static int Open ( vlc_object_t *p_this ) { return VLC_EGENERIC; } - /* 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 || - 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 ); - - if( p_enc->fmt_in.video.i_width < 16 || - p_enc->fmt_in.video.i_height < 16 ) - { - msg_Err( p_enc, "video is too small to be cropped" ); - return VLC_EGENERIC; - } - - msg_Warn( p_enc, "cropping video to %ix%i", - p_enc->fmt_in.video.i_width >> 4 << 4, - p_enc->fmt_in.video.i_height >> 4 << 4 ); - } -#endif - config_ChainParse( p_enc, SOUT_CFG_PREFIX, ppsz_sout_options, p_enc->p_cfg ); p_enc->fmt_out.i_cat = VIDEO_ES; @@ -825,400 +736,323 @@ static int Open ( vlc_object_t *p_this ) 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->i_initial_delay = 0; p_sys->psz_stat_name = NULL; - p_sys->p_buffer = NULL; x264_param_default( &p_sys->param ); + char *psz_preset = var_GetString( p_enc, SOUT_CFG_PREFIX "preset" ); + char *psz_tune = var_GetString( p_enc, SOUT_CFG_PREFIX "tune" ); + if( *psz_preset == '\0' ) + { + free(psz_preset); + psz_preset = NULL; + } + x264_param_default_preset( &p_sys->param, psz_preset, psz_tune ); + free( psz_preset ); + free( psz_tune ); p_sys->param.i_width = p_enc->fmt_in.video.i_width; p_sys->param.i_height = p_enc->fmt_in.video.i_height; -#if X264_BUILD < 37 - p_sys->param.i_width = p_sys->param.i_width >> 4 << 4; - p_sys->param.i_height = p_sys->param.i_height >> 4 << 4; -#endif - - var_Get( p_enc, SOUT_CFG_PREFIX "qcomp", &val ); - p_sys->param.rc.f_qcompress = val.f_float; + if( fabs(var_GetFloat( p_enc, SOUT_CFG_PREFIX "qcomp" ) - 0.60) > 0.005 ) + p_sys->param.rc.f_qcompress = var_GetFloat( p_enc, SOUT_CFG_PREFIX "qcomp" ); /* transcode-default bitrate is 0, * set more to ABR if user specifies bitrate */ if( p_enc->fmt_out.i_bitrate > 0 ) { 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 */ - p_sys->param.rc.b_cbr=1; -#endif p_sys->param.rc.i_rc_method = X264_RC_ABR; } else /* Set default to CRF */ { -#if X264_BUILD >= 37 - var_Get( p_enc, SOUT_CFG_PREFIX "crf", &val ); - if( val.i_int > 0 && val.i_int <= 51 ) + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "crf" ); + if( i_val > 0 && i_val <= 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.f_rf_constant = i_val; p_sys->param.rc.i_rc_method = X264_RC_CRF; -# endif } -#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_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "qpstep" ); + if( i_val >= 0 && i_val <= 51 ) p_sys->param.rc.i_qp_step = i_val; + + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "qpmin" ); + if( i_val >= 0 && i_val <= 51 ) { - i_qmin = val.i_int; + i_qmin = i_val; 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_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "qpmax" ); + if( i_val >= 0 && i_val <= 51 ) { - i_qmax = val.i_int; + i_qmax = i_val; 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 ) + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "qp" ); + if( i_val >= 0 && i_val <= 51 ) { - if( i_qmin > val.i_int ) i_qmin = val.i_int; - if( i_qmax < val.i_int ) i_qmax = val.i_int; + if( i_qmin > i_val ) i_qmin = i_val; + if( i_qmax < i_val ) i_qmax = i_val; /* User defined QP-value, so change ratecontrol method */ 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_constant = i_val; p_sys->param.rc.i_qp_min = i_qmin; p_sys->param.rc.i_qp_max = i_qmax; -#else - p_sys->param.i_qp_constant = val.i_int; -#endif } -#if X264_BUILD >= 24 - var_Get( p_enc, SOUT_CFG_PREFIX "ratetol", &val ); - p_sys->param.rc.f_rate_tolerance = val.f_float; - - var_Get( p_enc, SOUT_CFG_PREFIX "vbv-init", &val ); - p_sys->param.rc.f_vbv_buffer_init = val.f_float; - - var_Get( p_enc, SOUT_CFG_PREFIX "vbv-bufsize", &val ); - p_sys->param.rc.i_vbv_buffer_size = val.i_int; + p_sys->param.rc.f_rate_tolerance = var_GetFloat( p_enc, + SOUT_CFG_PREFIX "ratetol" ); + p_sys->param.rc.f_vbv_buffer_init = var_GetFloat( p_enc, + SOUT_CFG_PREFIX "vbv-init" ); + p_sys->param.rc.i_vbv_buffer_size = var_GetInteger( p_enc, + SOUT_CFG_PREFIX "vbv-bufsize" ); /* max bitrate = average bitrate -> CBR */ - var_Get( p_enc, SOUT_CFG_PREFIX "vbv-maxrate", &val ); -#if X264_BUILD >= 48 - if( !val.i_int && p_sys->param.rc.i_rc_method == X264_RC_ABR ) - p_sys->param.rc.i_vbv_max_bitrate = p_sys->param.rc.i_bitrate; - else if ( val.i_int ) -#endif - p_sys->param.rc.i_vbv_max_bitrate = val.i_int; + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" ); -#else - p_sys->param.rc.i_rc_buffer_size = p_sys->param.rc.i_bitrate; - p_sys->param.rc.i_rc_init_buffer = p_sys->param.rc.i_bitrate / 4; -#endif + if( !i_val && p_sys->param.rc.i_rc_method == X264_RC_ABR ) + p_sys->param.rc.i_vbv_max_bitrate = p_sys->param.rc.i_bitrate; + else if ( i_val ) + p_sys->param.rc.i_vbv_max_bitrate = i_val; - var_Get( p_enc, SOUT_CFG_PREFIX "cabac", &val ); - p_sys->param.b_cabac = val.b_bool; + + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ) ) + p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ); /* disable deblocking when nf (no loop filter) is enabled */ - var_Get( p_enc, SOUT_CFG_PREFIX "nf", &val ); - p_sys->param.b_deblocking_filter = !val.b_bool; + if( var_GetBool( p_enc, SOUT_CFG_PREFIX "nf" ) ) + p_sys->param.b_deblocking_filter = !var_GetBool( p_enc, SOUT_CFG_PREFIX "nf" ); - var_Get( p_enc, SOUT_CFG_PREFIX "deblock", &val ); - if( val.psz_string ) + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "deblock" ); + if( psz_val ) { - 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 ); + if( atoi( psz_val ) != 0 ) + { + char *p = strchr( psz_val, ':' ); + p_sys->param.i_deblocking_filter_alphac0 = atoi( psz_val ); + p_sys->param.i_deblocking_filter_beta = p ? + atoi( p+1 ) : p_sys->param.i_deblocking_filter_alphac0; + } + free( psz_val ); } -#if X264_BUILD >= 65 - var_Get( p_enc, SOUT_CFG_PREFIX "psy-rd", &val ); - if( val.psz_string ) + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "psy-rd" ); + if( psz_val ) { - char *p = strchr( val.psz_string, ':' ); - p_sys->param.analyse.f_psy_rd = us_atof( val.psz_string ); - p_sys->param.analyse.f_psy_trellis = p ? us_atof( p+1 ) : 0; - free( val.psz_string ); + if( us_atof( psz_val ) != 1.0 ) + { + char *p = strchr( psz_val, ':' ); + p_sys->param.analyse.f_psy_rd = us_atof( psz_val ); + p_sys->param.analyse.f_psy_trellis = p ? us_atof( p+1 ) : 0; + } + free( psz_val ); } -#endif + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "psy" ) ) + p_sys->param.analyse.b_psy = var_GetBool( p_enc, SOUT_CFG_PREFIX "psy" ); - var_Get( p_enc, SOUT_CFG_PREFIX "level", &val ); - if( val.psz_string ) + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "level" ); + if( psz_val ) { - if( us_atof (val.psz_string) < 6 ) - p_sys->param.i_level_idc = (int) (10 * us_atof (val.psz_string) + if( us_atof (psz_val) < 6 && us_atof (psz_val) > 0 ) + p_sys->param.i_level_idc = (int) (10 * us_atof (psz_val) + .5); - else - p_sys->param.i_level_idc = atoi (val.psz_string); - free( val.psz_string ); + else if( atoi(psz_val) >= 10 && atoi(psz_val) <= 51 ) + p_sys->param.i_level_idc = atoi (psz_val); + free( psz_val ); } -#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; - - var_Get( p_enc, SOUT_CFG_PREFIX "pbratio", &val ); - p_sys->param.rc.f_pb_factor = val.f_float; - - - var_Get( p_enc, SOUT_CFG_PREFIX "cplxblur", &val ); - p_sys->param.rc.f_complexity_blur = val.f_float; + p_sys->param.b_interlaced = var_GetBool( p_enc, SOUT_CFG_PREFIX "interlaced" ); + if( fabs(var_GetFloat( p_enc, SOUT_CFG_PREFIX "ipratio" ) - 1.4) > 0.005 ) + p_sys->param.rc.f_ip_factor = var_GetFloat( p_enc, SOUT_CFG_PREFIX "ipratio" ); + if( fabs(var_GetFloat( p_enc, SOUT_CFG_PREFIX "pbratio" ) - 1.3 ) > 0.005 ) + p_sys->param.rc.f_pb_factor = var_GetFloat( p_enc, SOUT_CFG_PREFIX "pbratio" ); + p_sys->param.rc.f_complexity_blur = var_GetFloat( p_enc, SOUT_CFG_PREFIX "cplxblur" ); + p_sys->param.rc.f_qblur = var_GetFloat( p_enc, SOUT_CFG_PREFIX "qblur" ); + if( var_GetInteger( p_enc, SOUT_CFG_PREFIX "aq-mode" ) != X264_AQ_VARIANCE ) + p_sys->param.rc.i_aq_mode = var_GetInteger( p_enc, SOUT_CFG_PREFIX "aq-mode" ); + if( fabs( var_GetFloat( p_enc, SOUT_CFG_PREFIX "aq-strength" ) - 1.0) > 0.005 ) + p_sys->param.rc.f_aq_strength = var_GetFloat( p_enc, SOUT_CFG_PREFIX "aq-strength" ); - var_Get( p_enc, SOUT_CFG_PREFIX "qblur", &val ); - p_sys->param.rc.f_qblur = val.f_float; + if( var_GetBool( p_enc, SOUT_CFG_PREFIX "verbose" ) ) + p_sys->param.i_log_level = X264_LOG_DEBUG; -#if X264_BUILD >= 59 - var_Get( p_enc, SOUT_CFG_PREFIX "aq-mode", &val ); - p_sys->param.rc.i_aq_mode = val.i_int; + if( var_GetBool( p_enc, SOUT_CFG_PREFIX "quiet" ) ) + p_sys->param.i_log_level = X264_LOG_NONE; - 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; -#endif + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "sps-id" ); + if( i_val >= 0 ) p_sys->param.i_sps_id = i_val; - var_Get( p_enc, SOUT_CFG_PREFIX "quiet", &val ); - if( val.b_bool ) p_sys->param.i_log_level = X264_LOG_NONE; + if( var_GetBool( p_enc, SOUT_CFG_PREFIX "aud" ) ) + p_sys->param.b_aud = true; -#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 + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "keyint" ); + if( i_val > 0 && i_val != 250 ) p_sys->param.i_keyint_max = i_val; - var_Get( p_enc, SOUT_CFG_PREFIX "aud", &val ); - if( val.b_bool ) p_sys->param.b_aud = val.b_bool; + 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; - 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; -#else - if( val.i_int > 0 ) p_sys->param.i_iframe = val.i_int; -#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; - var_Get( p_enc, SOUT_CFG_PREFIX "min-keyint", &val ); -#if X264_BUILD >= 0x000e - if( val.i_int > 0 ) p_sys->param.i_keyint_min = val.i_int; -#else - if( val.i_int > 0 ) p_sys->param.i_idrframe = val.i_int; -#endif + p_sys->param.b_intra_refresh = var_GetBool( p_enc, SOUT_CFG_PREFIX "intra-refresh" ); - var_Get( p_enc, SOUT_CFG_PREFIX "bframes", &val ); - if( val.i_int >= 0 && val.i_int <= 16 ) - p_sys->param.i_bframe = val.i_int; + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "bpyramid" ); + if( strcmp( psz_val, "none" ) ) + { + if ( !strcmp( psz_val, "strict" ) ) + { + p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_STRICT; + } else if ( !strcmp( psz_val, "normal" ) ) + { + p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NORMAL; + } + } + free( psz_val ); -#if X264_BUILD >= 22 - var_Get( p_enc, SOUT_CFG_PREFIX "bpyramid", &val ); - p_sys->param.b_bframe_pyramid = val.b_bool; -#endif + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "ref" ); + if( i_val > 0 && i_val <= 15 && i_val != 3 ) + p_sys->param.i_frame_reference = i_val; - var_Get( p_enc, SOUT_CFG_PREFIX "ref", &val ); - if( val.i_int > 0 && val.i_int <= 15 ) - p_sys->param.i_frame_reference = val.i_int; + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "scenecut" ); + if( i_val >= -1 && i_val <= 100 && i_val != 40 ) + p_sys->param.i_scenecut_threshold = i_val; - var_Get( p_enc, SOUT_CFG_PREFIX "scenecut", &val ); -#if X264_BUILD >= 0x000b - if( val.i_int >= -1 && val.i_int <= 100 ) - p_sys->param.i_scenecut_threshold = val.i_int; -#endif + p_sys->param.b_deterministic = var_GetBool( p_enc, + SOUT_CFG_PREFIX "non-deterministic" ); -#if X264_BUILD >= 55 /* r607 */ && X264_BUILD < 67 /* r1117 */ - var_Get( p_enc, SOUT_CFG_PREFIX "pre-scenecut", &val ); - p_sys->param.b_pre_scenecut = val.b_bool; -#endif + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "subme" ); + if( i_val >= 1 && i_val != 7 ) + p_sys->param.analyse.i_subpel_refine = i_val; -#if X264_BUILD >= 55 /* r607 */ - var_Get( p_enc, SOUT_CFG_PREFIX "non-deterministic", &val ); - p_sys->param.b_deterministic = val.b_bool; +#if X264_BUILD >= 89 + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "hrd"); + if( !strcmp( psz_val, "vbr" ) ) + p_sys->param.i_nal_hrd = X264_NAL_HRD_VBR; + else if( !strcmp( psz_val, "cbr" ) ) + p_sys->param.i_nal_hrd = X264_NAL_HRD_CBR; + free( psz_val ); #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; - -#if X264_BUILD >= 24 - var_Get( p_enc, SOUT_CFG_PREFIX "me", &val ); - if( !strcmp( val.psz_string, "dia" ) ) - { - p_sys->param.analyse.i_me_method = X264_ME_DIA; - } - else if( !strcmp( val.psz_string, "hex" ) ) - { - p_sys->param.analyse.i_me_method = X264_ME_HEX; - } - else if( !strcmp( val.psz_string, "umh" ) ) - { - p_sys->param.analyse.i_me_method = X264_ME_UMH; - } - else if( !strcmp( val.psz_string, "esa" ) ) - { - p_sys->param.analyse.i_me_method = X264_ME_ESA; - } -# if X264_BUILD >= 58 /* r728 */ - else if( !strcmp( val.psz_string, "tesa" ) ) + //TODO: psz_val == NULL ? + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "me" ); + if( psz_val && strcmp( psz_val, "hex" ) ) { - p_sys->param.analyse.i_me_method = X264_ME_TESA; + if( !strcmp( psz_val, "dia" ) ) + { + p_sys->param.analyse.i_me_method = X264_ME_DIA; + } + else if( !strcmp( psz_val, "umh" ) ) + { + p_sys->param.analyse.i_me_method = X264_ME_UMH; + } + else if( !strcmp( psz_val, "esa" ) ) + { + p_sys->param.analyse.i_me_method = X264_ME_ESA; + } + else if( !strcmp( psz_val, "tesa" ) ) + { + p_sys->param.analyse.i_me_method = X264_ME_TESA; + } + free( psz_val ); } -# endif - free( val.psz_string ); - var_Get( p_enc, SOUT_CFG_PREFIX "merange", &val ); - if( val.i_int >= 0 && val.i_int <= 64 ) - p_sys->param.analyse.i_me_range = val.i_int; + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "merange" ); + if( i_val >= 0 && i_val <= 64 && i_val != 16 ) + p_sys->param.analyse.i_me_range = i_val; - 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 + p_sys->param.analyse.i_mv_range = var_GetInteger( p_enc, + SOUT_CFG_PREFIX "mvrange" ); + p_sys->param.analyse.i_mv_range_thread = var_GetInteger( p_enc, + SOUT_CFG_PREFIX "mvrange-thread" ); - var_Get( p_enc, SOUT_CFG_PREFIX "direct", &val ); - if( !strcmp( val.psz_string, "none" ) ) + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "direct" ); + if( !strcmp( psz_val, "none" ) ) { p_sys->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_NONE; } - else if( !strcmp( val.psz_string, "spatial" ) ) + else if( !strcmp( psz_val, "spatial" ) ) { p_sys->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_SPATIAL; } - else if( !strcmp( val.psz_string, "temporal" ) ) + else if( !strcmp( psz_val, "temporal" ) ) { p_sys->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_TEMPORAL; } -#if X264_BUILD >= 45 /* r457 */ - else if( !strcmp( val.psz_string, "auto" ) ) + else if( !strcmp( psz_val, "auto" ) ) { p_sys->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO; } -#endif - 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; -#endif - -#if X264_BUILD >= 0x0013 - var_Get( p_enc, SOUT_CFG_PREFIX "b-adapt", &val ); -#if X264_BUILD >= 63 - p_sys->param.i_bframe_adaptive = val.i_int; -#else - p_sys->param.b_bframe_adaptive = val.b_bool; -#endif - - var_Get( p_enc, SOUT_CFG_PREFIX "b-bias", &val ); - if( val.i_int >= -100 && val.i_int <= 100 ) - p_sys->param.i_bframe_bias = val.i_int; -#endif - -#if X264_BUILD >= 23 - var_Get( p_enc, SOUT_CFG_PREFIX "chroma-me", &val ); - p_sys->param.analyse.b_chroma_me = val.b_bool; - var_Get( p_enc, SOUT_CFG_PREFIX "chroma-qp-offset", &val ); - p_sys->param.analyse.i_chroma_qp_offset = val.i_int; -#endif - -#if X264_BUILD >= 36 - var_Get( p_enc, SOUT_CFG_PREFIX "mixed-refs", &val ); - p_sys->param.analyse.b_mixed_references = val.b_bool; -#endif - - -#if X264_BUILD >= 39 - var_Get( p_enc, SOUT_CFG_PREFIX "trellis", &val ); - if( val.i_int >= 0 && val.i_int <= 2 ) - p_sys->param.analyse.i_trellis = val.i_int; -#endif - -#if X264_BUILD >= 41 && X264_BUILD < 65 - var_Get( p_enc, SOUT_CFG_PREFIX "b-rdo", &val ); - p_sys->param.analyse.b_bframe_rdo = val.b_bool; -#endif - -#if X264_BUILD >= 42 - var_Get( p_enc, SOUT_CFG_PREFIX "fast-pskip", &val ); - p_sys->param.analyse.b_fast_pskip = val.b_bool; -#endif - -#if X264_BUILD >= 43 && X264_BUILD < 65 - var_Get( p_enc, SOUT_CFG_PREFIX "bime", &val ); - p_sys->param.analyse.b_bidir_me = val.b_bool; -#endif - -#if X264_BUILD >= 44 - var_Get( p_enc, SOUT_CFG_PREFIX "nr", &val ); - 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; - -#if X264_BUILD <= 65 - 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 -#endif - - var_Get( p_enc, SOUT_CFG_PREFIX "asm", &val ); - if( !val.b_bool ) p_sys->param.cpu = 0; + free( psz_val ); + + 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" ) ) + 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 ) + p_sys->param.analyse.i_weighted_pred = var_GetInteger( p_enc, SOUT_CFG_PREFIX "weightp" ); + + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "b-adapt" ); + if( i_val != 1 ) + p_sys->param.i_bframe_adaptive = i_val; + + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "b-bias" ); + if( i_val >= -100 && i_val <= 100 && i_val != 0) + p_sys->param.i_bframe_bias = i_val; + + p_sys->param.analyse.b_chroma_me = var_GetBool( p_enc, + SOUT_CFG_PREFIX "chroma-me" ); + p_sys->param.analyse.i_chroma_qp_offset = var_GetInteger( p_enc, + SOUT_CFG_PREFIX "chroma-qp-offset" ); + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mixed-refs" ) ) + p_sys->param.analyse.b_mixed_references = var_GetBool( p_enc, + SOUT_CFG_PREFIX "mixed-refs" ); + + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "trellis" ); + if( i_val >= 0 && i_val <= 2 && i_val != 1 ) + p_sys->param.analyse.i_trellis = i_val; + + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "fast-pskip" ) ) + p_sys->param.analyse.b_fast_pskip = var_GetBool( p_enc, + SOUT_CFG_PREFIX "fast-pskip" ); + + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "nr" ); + if( i_val > 0 && i_val <= 1000 ) + p_sys->param.analyse.i_noise_reduction = i_val; + + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "dct-decimate" ) ) + p_sys->param.analyse.b_dct_decimate = var_GetBool( p_enc, + SOUT_CFG_PREFIX "dct-decimate" ); + + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "deadzone-inter" ); + if( i_val >= 0 && i_val <= 32 && i_val != 21 ) + p_sys->param.analyse.i_luma_deadzone[0] = i_val; + + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "deadzone-intra" ); + if( i_val >= 0 && i_val <= 32 && i_val != 11) + p_sys->param.analyse.i_luma_deadzone[1] = i_val; + + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "asm" ) ) + p_sys->param.cpu = 0; #ifndef X264_ANALYSE_BSUB16x16 # define X264_ANALYSE_BSUB16x16 0 #endif - var_Get( p_enc, SOUT_CFG_PREFIX "partitions", &val ); - if( !strcmp( val.psz_string, "none" ) ) + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "partitions" ); + if( !strcmp( psz_val, "none" ) ) { p_sys->param.analyse.inter = 0; } - else if( !strcmp( val.psz_string, "fast" ) ) + else if( !strcmp( psz_val, "fast" ) ) { p_sys->param.analyse.inter = X264_ANALYSE_I4x4; } - else if( !strcmp( val.psz_string, "normal" ) ) + else if( !strcmp( psz_val, "normal" ) ) { p_sys->param.analyse.inter = X264_ANALYSE_I4x4 | @@ -1227,7 +1061,7 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.analyse.inter |= X264_ANALYSE_I8x8; #endif } - else if( !strcmp( val.psz_string, "slow" ) ) + else if( !strcmp( psz_val, "slow" ) ) { p_sys->param.analyse.inter = X264_ANALYSE_I4x4 | @@ -1237,27 +1071,23 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.analyse.inter |= X264_ANALYSE_I8x8; #endif } - else if( !strcmp( val.psz_string, "all" ) ) + else if( !strcmp( psz_val, "all" ) ) { p_sys->param.analyse.inter = ~0; } - free( val.psz_string ); + free( psz_val ); -#if X264_BUILD >= 30 - var_Get( p_enc, SOUT_CFG_PREFIX "8x8dct", &val ); - p_sys->param.analyse.b_transform_8x8 = val.b_bool; -#endif + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "8x8dct" ) ) + p_sys->param.analyse.b_transform_8x8 = var_GetBool( p_enc, + SOUT_CFG_PREFIX "8x8dct" ); - if( p_enc->fmt_in.video.i_aspect > 0 ) + if( p_enc->fmt_in.video.i_sar_num > 0 && + p_enc->fmt_in.video.i_sar_den > 0 ) { - int64_t i_num, i_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; - i_den = VOUT_ASPECT_FACTOR * p_enc->fmt_in.video.i_width; - vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 ); - + vlc_ureduce( &i_dst_num, &i_dst_den, + p_enc->fmt_in.video.i_sar_num, + p_enc->fmt_in.video.i_sar_den, 0 ); p_sys->param.vui.i_sar_width = i_dst_num; p_sys->param.vui.i_sar_height = i_dst_den; } @@ -1266,8 +1096,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; + p_sys->param.b_vfr_input = 0; } + /* Check slice-options */ + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "slices" ); + if( i_val > 0 ) + p_sys->param.i_slice_count = i_val; + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "slice-max-size" ); + if( i_val > 0 ) + p_sys->param.i_slice_max_size = i_val; + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "slice-max-mbs" ); + if( i_val > 0 ) + p_sys->param.i_slice_max_mbs = i_val; + + /* x264 vbv-bufsize = 0 (default). if not provided set period in seconds for local maximum bitrate (cache/bufsize) based on average bitrate when use has told bitrate. @@ -1278,34 +1121,31 @@ static int Open ( vlc_object_t *p_this ) { p_sys->param.rc.i_vbv_buffer_size = p_sys->param.rc.i_bitrate * p_sys->param.i_fps_den; -#if X264_BUILD >= 0x000e p_sys->param.rc.i_vbv_buffer_size *= p_sys->param.i_keyint_max; -#else - p_sys->param.rc.i_vbv_buffer_size *= p_sys->param.i_idrframe; -#endif p_sys->param.rc.i_vbv_buffer_size /= p_sys->param.i_fps_num; } /* Check if user has given some profile (baseline,main,high) to limit * settings, and apply those*/ - var_Get( p_enc, SOUT_CFG_PREFIX "profile", &val ); - if( val.psz_string ) + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" ); + if( psz_val ) { - if( !strcasecmp( val.psz_string, "baseline" ) ) + if( !strcasecmp( psz_val, "baseline" ) ) { msg_Dbg( p_enc, "Limiting to baseline profile"); p_sys->param.analyse.b_transform_8x8 = 0; p_sys->param.b_cabac = 0; p_sys->param.i_bframe = 0; + p_sys->param.analyse.i_weighted_pred = X264_WEIGHTP_NONE; } - else if (!strcasecmp( val.psz_string, "main" ) ) + else if (!strcasecmp( psz_val, "main" ) ) { msg_Dbg( p_enc, "Limiting to main-profile"); p_sys->param.analyse.b_transform_8x8 = 0; } /* high profile don't restrict stuff*/ } - free( val.psz_string ); + free( psz_val ); unsigned i_cpu = vlc_CPU(); @@ -1331,61 +1171,51 @@ static int Open ( vlc_object_t *p_this ) 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 p_sys->param.i_threads = p_enc->i_threads; -#endif - var_Get( p_enc, SOUT_CFG_PREFIX "stats", &val ); - if( val.psz_string ) + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "stats" ); + if( psz_val ) { p_sys->param.rc.psz_stat_in = p_sys->param.rc.psz_stat_out = - p_sys->psz_stat_name = val.psz_string; + p_sys->psz_stat_name = psz_val; } - var_Get( p_enc, SOUT_CFG_PREFIX "pass", &val ); - if( val.i_int > 0 && val.i_int <= 3 ) + i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "pass" ); + if( i_val > 0 && i_val <= 3 ) { - p_sys->param.rc.b_stat_write = val.i_int & 1; - p_sys->param.rc.b_stat_read = val.i_int & 2; + p_sys->param.rc.b_stat_write = i_val & 1; + p_sys->param.rc.b_stat_read = i_val & 2; } + 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, but only once for the whole application. Since pthreadw32 doesn't keep a refcount, do it ourselves. */ #ifdef PTW32_STATIC_LIB - vlc_value_t lock, count; - - var_Create( p_enc->p_libvlc, "pthread_win32_mutex", VLC_VAR_MUTEX ); - var_Get( p_enc->p_libvlc, "pthread_win32_mutex", &lock ); - vlc_mutex_lock( lock.p_address ); + vlc_mutex_lock( &pthread_win32_mutex ); - var_Create( p_enc->p_libvlc, "pthread_win32_count", VLC_VAR_INTEGER ); - var_Get( p_enc->p_libvlc, "pthread_win32_count", &count ); - - if( count.i_int == 0 ) + if( pthread_win32_count == 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 ); + vlc_mutex_unlock( &pthread_win32_mutex ); return VLC_EGENERIC; } } - count.i_int++; - var_Set( p_enc->p_libvlc, "pthread_win32_count", count ); - vlc_mutex_unlock( lock.p_address ); - + pthread_win32_count++; + vlc_mutex_unlock( &pthread_win32_mutex ); #endif -#if X264_BUILD >= 69 /* 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=5; -#endif + p_sys->param.rc.i_lookahead= var_GetInteger( p_enc, SOUT_CFG_PREFIX "lookahead" ); /* Open the encoder */ p_sys->h = x264_encoder_open( &p_sys->param ); @@ -1397,40 +1227,22 @@ static int Open ( vlc_object_t *p_this ) return VLC_EGENERIC; } - /* alloc mem */ - 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; p_enc->fmt_out.p_extra = NULL; - x264_encoder_headers( p_sys->h, &nal, &i_nal ); + 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 ) + { + 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++ ) { - void *p_tmp; - int i_size = p_sys->i_buffer; - - x264_nal_encode( p_sys->p_buffer, &i_size, 1, &nal[i] ); - - 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_enc->fmt_out.i_extra += i_size; + memcpy( p_tmp, nal[i].p_payload, nal[i].i_payload ); + p_tmp += nal[i].i_payload; } return VLC_SUCCESS; @@ -1445,80 +1257,70 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) x264_picture_t pic; x264_nal_t *nal; block_t *p_block; - int i_nal, i_out, i; + int i_nal=0, i_out=0, i=0; /* init pic */ memset( &pic, 0, sizeof( x264_picture_t ) ); - pic.i_pts = p_pict->date; - pic.img.i_csp = X264_CSP_I420; - pic.img.i_plane = p_pict->i_planes; - for( i = 0; i < p_pict->i_planes; i++ ) - { - pic.img.plane[i] = p_pict->p[i].p_pixels; - pic.img.i_stride[i] = p_pict->p[i].i_pitch; + if( likely(p_pict) ) { + pic.i_pts = p_pict->date; + pic.img.i_csp = X264_CSP_I420; + pic.img.i_plane = p_pict->i_planes; + for( i = 0; i < p_pict->i_planes; i++ ) + { + pic.img.plane[i] = p_pict->p[i].p_pixels; + pic.img.i_stride[i] = p_pict->p[i].i_pitch; + } + + x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic, &pic ); + } else { + if( x264_encoder_delayed_frames( p_sys->h ) ) { + x264_encoder_encode( p_sys->h, &nal, &i_nal, NULL, &pic ); + } } -#if X264_BUILD >= 0x0013 - x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic, &pic ); -#else - x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic ); -#endif - if( !i_nal ) return NULL; - for( i = 0, i_out = 0; i < i_nal; i++ ) - { - int i_size = p_sys->i_buffer - i_out; - x264_nal_encode( p_sys->p_buffer + i_out, &i_size, 1, &nal[i] ); - i_out += i_size; - } + /* Get size of block we need */ + for( i = 0, i_out = 0; i < i_nal; i++ ) + i_out += nal[i].i_payload; 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 ) + /* copy encoded data directly to block */ + for( i = 0, i_out = 0; i < i_nal; i++ ) + { + memcpy( p_block->p_buffer + i_out, nal[i].p_payload, nal[i].i_payload ); + i_out += nal[i].i_payload; + } + + if( pic.b_keyframe ) p_block->i_flags |= BLOCK_FLAG_TYPE_I; - else if( pic.i_type == X264_TYPE_P ) + else if( pic.i_type == X264_TYPE_P || pic.i_type == X264_TYPE_I ) p_block->i_flags |= BLOCK_FLAG_TYPE_P; else if( pic.i_type == X264_TYPE_B ) p_block->i_flags |= BLOCK_FLAG_TYPE_B; + else + p_block->i_flags |= BLOCK_FLAG_TYPE_PB; /* This isn't really valid for streams with B-frames */ p_block->i_length = INT64_C(1000000) * p_enc->fmt_in.video.i_frame_rate_base / p_enc->fmt_in.video.i_frame_rate; - p_block->i_pts = pic.i_pts; - - if( p_sys->param.i_bframe > 0 ) - { - if( p_block->i_flags & BLOCK_FLAG_TYPE_B ) - { - /* FIXME : this is wrong if bpyramid is set */ - p_block->i_dts = p_block->i_pts; - p_sys->i_interpolated_dts = p_block->i_dts; - } - else - { - if( p_sys->i_interpolated_dts ) - { - p_block->i_dts = p_sys->i_interpolated_dts; - } - else - { - /* Let's put something sensible */ - p_block->i_dts = p_block->i_pts; - } - - p_sys->i_interpolated_dts += p_block->i_length; - } - } - else + /* 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_block->i_dts = p_block->i_pts; + p_sys->i_initial_delay = -1* pic.i_dts; + msg_Dbg( p_enc, "Initial delay is set to %d", p_sys->i_initial_delay ); } + p_block->i_pts = pic.i_pts + p_sys->i_initial_delay; + p_block->i_dts = pic.i_dts + p_sys->i_initial_delay; return p_block; } @@ -1533,28 +1335,24 @@ static void Close( vlc_object_t *p_this ) free( p_sys->psz_stat_name ); + msg_Dbg( p_enc, "framecount still in libx264 buffer: %d", x264_encoder_delayed_frames( p_sys->h ) ); + if( p_sys->h ) x264_encoder_close( p_sys->h ); #ifdef PTW32_STATIC_LIB - vlc_value_t lock, count; + vlc_mutex_lock( &pthread_win32_mutex ); + pthread_win32_count--; - var_Get( p_enc->p_libvlc, "pthread_win32_mutex", &lock ); - vlc_mutex_lock( lock.p_address ); - - var_Get( p_enc->p_libvlc, "pthread_win32_count", &count ); - count.i_int--; - var_Set( p_enc->p_libvlc, "pthread_win32_count", count ); - - if( count.i_int == 0 ) + if( pthread_win32_count == 0 ) { pthread_win32_thread_detach_np(); pthread_win32_process_detach_np(); msg_Dbg( p_enc, "pthread-win32 deinitialized" ); } - vlc_mutex_unlock( lock.p_address ); + + vlc_mutex_unlock( &pthread_win32_mutex ); #endif - free( p_sys->p_buffer ); free( p_sys ); }