X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fx264.c;h=029ee5b56b37dbb25d1f392f56c172f1b717e122;hb=21659d6907abfeeae475e276b595dabff63bf4f9;hp=ee5bd6e974b380e87b35d3580319acd6be4adb40;hpb=002746bfd2146e5b9dd698cccf6774ab75d42d56;p=vlc diff --git a/modules/codec/x264.c b/modules/codec/x264.c index ee5bd6e974..029ee5b56b 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -1,7 +1,7 @@ /***************************************************************************** * x264.c: h264 video encoder ***************************************************************************** - * Copyright (C) 2004-2006 the VideoLAN team + * Copyright (C) 2004-2010 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -35,6 +35,7 @@ #include #include #include +#include #ifdef PTW32_STATIC_LIB #include @@ -93,7 +94,6 @@ static void Close( vlc_object_t * ); #define BPYRAMID_TEXT N_("Keep some B-frames as references") -#if X264_BUILD >= 78 #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.\n" \ @@ -101,11 +101,6 @@ static void Close( vlc_object_t * ); " - strict: Strictly hierarchical pyramid\n" \ " - normal: Non-strict (not Blu-ray compatible)\n"\ ) -#else -#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." ) -#endif #define CABAC_TEXT N_("CABAC") #define CABAC_LONGTEXT N_( "CABAC (Context-Adaptive Binary Arithmetic "\ @@ -130,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" \ @@ -142,6 +137,20 @@ static void Close( vlc_object_t * ); #define INTERLACED_TEXT N_("Interlaced mode") #define INTERLACED_LONGTEXT N_( "Pure-interlaced mode.") +#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") @@ -275,8 +284,6 @@ static void Close( vlc_object_t * ); #define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \ "quality") - -#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." ) @@ -315,6 +322,9 @@ 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. " \ @@ -366,6 +376,13 @@ static void Close( vlc_object_t * ); "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." ) + static const char *const enc_me_list[] = { "dia", "hex", "umh", "esa", "tesa" }; static const char *const enc_me_list_text[] = @@ -374,10 +391,8 @@ static const char *const enc_me_list_text[] = static const char *const profile_list[] = { "baseline", "main", "high" }; -#if X264_BUILD >= 78 static const char *const bpyramid_list[] = { "none", "strict", "normal" }; -#endif static const char *const enc_analyse_list[] = { "none", "fast", "normal", "slow", "all" }; @@ -403,7 +418,6 @@ 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 ) @@ -423,14 +437,14 @@ vlc_module_begin () B_BIAS_LONGTEXT, false ) change_integer_range( -100, 100 ) -#if X264_BUILD >= 78 - add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT, +#if X264_BUILD >= 87 + add_string( SOUT_CFG_PREFIX "bpyramid", "normal", NULL, BPYRAMID_TEXT, BPYRAMID_LONGTEXT, false ) - change_string_list( bpyramid_list, bpyramid_list, 0 ); #else - add_bool( SOUT_CFG_PREFIX "bpyramid", false, NULL, BPYRAMID_TEXT, + add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT, BPYRAMID_LONGTEXT, false ) #endif + change_string_list( bpyramid_list, bpyramid_list, 0 ); add_bool( SOUT_CFG_PREFIX "cabac", true, NULL, CABAC_TEXT, CABAC_LONGTEXT, false ) @@ -438,29 +452,38 @@ 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 */ add_string( SOUT_CFG_PREFIX "psy-rd", "1.0:0.0", NULL, PSY_RD_TEXT, PSY_RD_LONGTEXT, false ) - 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 ); 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, @@ -474,12 +497,10 @@ vlc_module_begin () 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 ) @@ -488,7 +509,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 ) @@ -537,7 +557,6 @@ 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 ) @@ -568,10 +587,8 @@ vlc_module_begin () add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT, MVRANGE_THREAD_LONGTEXT, false ) - 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 */ add_obsolete_bool( SOUT_CFG_PREFIX "b-rdo" ) @@ -583,7 +600,7 @@ vlc_module_begin () add_obsolete_bool( SOUT_CFG_PREFIX "bime" ) - 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 ) add_integer( SOUT_CFG_PREFIX "trellis", 1, NULL, TRELLIS_TEXT, @@ -594,6 +611,11 @@ vlc_module_begin () 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 ) @@ -643,24 +665,31 @@ vlc_module_begin () 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", "weightp", "aq-mode", - "aq-strength", "psy-rd", "profile", "lookahead", 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 * ); @@ -670,11 +699,16 @@ struct encoder_sys_t x264_t *h; x264_param_t param; - 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 *****************************************************************************/ @@ -707,14 +741,25 @@ 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; 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; - p_sys->param.rc.f_qcompress = var_GetFloat( p_enc, SOUT_CFG_PREFIX "qcomp" ); + 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 */ @@ -778,48 +823,64 @@ static int Open ( vlc_object_t *p_this ) else if ( i_val ) p_sys->param.rc.i_vbv_max_bitrate = i_val; - p_sys->param.b_cabac = var_GetBool( p_enc, SOUT_CFG_PREFIX "cabac" ); + + 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 */ - p_sys->param.b_deblocking_filter = !var_GetBool( p_enc, SOUT_CFG_PREFIX "nf" ); + if( var_GetBool( p_enc, SOUT_CFG_PREFIX "nf" ) ) + p_sys->param.b_deblocking_filter = !var_GetBool( p_enc, SOUT_CFG_PREFIX "nf" ); psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "deblock" ); if( psz_val ) { - char *p = strchr( psz_val, ':' ); - p_sys->param.i_deblocking_filter_alphac0 = atoi( psz_val ); - p_sys->param.i_deblocking_filter_beta = p ? + 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 ); } psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "psy-rd" ); if( psz_val ) { - 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; + 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 ); } + if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "psy" ) ) + p_sys->param.analyse.b_psy = var_GetBool( p_enc, SOUT_CFG_PREFIX "psy" ); + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "level" ); if( psz_val ) { - if( us_atof (psz_val) < 6 ) + 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 + else if( atoi(psz_val) >= 10 && atoi(psz_val) <= 51 ) p_sys->param.i_level_idc = atoi (psz_val); free( psz_val ); } p_sys->param.b_interlaced = var_GetBool( p_enc, SOUT_CFG_PREFIX "interlaced" ); - p_sys->param.rc.f_ip_factor = var_GetFloat( p_enc, SOUT_CFG_PREFIX "ipratio" ); - p_sys->param.rc.f_pb_factor = var_GetFloat( p_enc, SOUT_CFG_PREFIX "pbratio" ); + 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" ); - p_sys->param.rc.i_aq_mode = var_GetInteger( p_enc, SOUT_CFG_PREFIX "aq-mode" ); - p_sys->param.rc.f_aq_strength = var_GetFloat( p_enc, SOUT_CFG_PREFIX "aq-strength" ); + 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" ); if( var_GetBool( p_enc, SOUT_CFG_PREFIX "verbose" ) ) p_sys->param.i_log_level = X264_LOG_DEBUG; @@ -834,74 +895,82 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.b_aud = true; i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "keyint" ); - if( i_val > 0 ) p_sys->param.i_keyint_max = i_val; + if( i_val > 0 && i_val != 250 ) p_sys->param.i_keyint_max = i_val; i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "min-keyint" ); - if( i_val > 0 ) p_sys->param.i_keyint_min = i_val; + if( i_val > 0 && i_val != 25 ) p_sys->param.i_keyint_min = i_val; i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "bframes" ); - if( i_val >= 0 && i_val <= 16 ) + if( i_val >= 0 && i_val <= 16 && i_val != 3 ) p_sys->param.i_bframe = i_val; -#if X264_BUILD >= 78 + p_sys->param.b_intra_refresh = var_GetBool( p_enc, SOUT_CFG_PREFIX "intra-refresh" ); + psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "bpyramid" ); - p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE; - if( !strcmp( psz_val, "none" ) ) + if( !strcmp( psz_val, "normal" ) ) { - p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE; - } else if ( !strcmp( psz_val, "strict" ) ) + p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NORMAL; + } + else 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_STRICT; + } + else if ( !strcmp( psz_val, "none" ) ) { - p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NORMAL; + p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE; } + free( psz_val ); -#else - p_sys->param.b_bframe_pyramid = var_GetBool( p_enc, SOUT_CFG_PREFIX "bpyramid" ); - #endif i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "ref" ); - if( i_val > 0 && i_val <= 15 ) + if( i_val > 0 && i_val <= 15 && i_val != 3 ) p_sys->param.i_frame_reference = i_val; i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "scenecut" ); - if( i_val >= -1 && i_val <= 100 ) + if( i_val >= -1 && i_val <= 100 && i_val != 40 ) p_sys->param.i_scenecut_threshold = i_val; p_sys->param.b_deterministic = var_GetBool( p_enc, SOUT_CFG_PREFIX "non-deterministic" ); i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "subme" ); - if( i_val >= 1 && i_val <= SUBME_MAX ) + if( i_val >= 1 && i_val != 7 ) p_sys->param.analyse.i_subpel_refine = i_val; +#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 + //TODO: psz_val == NULL ? psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "me" ); - if( !strcmp( psz_val, "dia" ) ) - { - p_sys->param.analyse.i_me_method = X264_ME_DIA; - } - else if( !strcmp( psz_val, "hex" ) ) - { - p_sys->param.analyse.i_me_method = X264_ME_HEX; - } - else if( !strcmp( psz_val, "umh" ) ) - { - p_sys->param.analyse.i_me_method = X264_ME_UMH; - } - else if( !strcmp( psz_val, "esa" ) ) + if( psz_val && strcmp( psz_val, "hex" ) ) { - 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; + 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 ); } - free( psz_val ); i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "merange" ); - if( i_val >= 0 && i_val <= 64 ) + if( i_val >= 0 && i_val <= 64 && i_val != 16 ) p_sys->param.analyse.i_me_range = i_val; p_sys->param.analyse.i_mv_range = var_GetInteger( p_enc, @@ -930,45 +999,50 @@ 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" ); - p_sys->param.analyse.b_weighted_bipred = var_GetBool( p_enc, + 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 X264_BUILD >= 79 - p_sys->param.analyse.i_weighted_pred = var_GetInteger( p_enc, SOUT_CFG_PREFIX "weightp" ); -#endif - p_sys->param.i_bframe_adaptive = var_GetInteger( p_enc, - SOUT_CFG_PREFIX "b-adapt" ); + 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 ) + 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" ); - p_sys->param.analyse.b_mixed_references = var_GetBool( p_enc, + 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 ) + if( i_val >= 0 && i_val <= 2 && i_val != 1 ) p_sys->param.analyse.i_trellis = i_val; - p_sys->param.analyse.b_fast_pskip = var_GetBool( p_enc, + 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 ) + if( i_val > 0 && i_val <= 1000 ) p_sys->param.analyse.i_noise_reduction = i_val; - p_sys->param.analyse.b_dct_decimate = var_GetBool( p_enc, + 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 ) + 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 ) + 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" ) ) @@ -1011,7 +1085,8 @@ static int Open ( vlc_object_t *p_this ) } free( psz_val ); - p_sys->param.analyse.b_transform_8x8 = var_GetBool( p_enc, + 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_sar_num > 0 && @@ -1029,8 +1104,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. @@ -1056,9 +1144,8 @@ static int Open ( vlc_object_t *p_this ) p_sys->param.analyse.b_transform_8x8 = 0; p_sys->param.b_cabac = 0; p_sys->param.i_bframe = 0; -#if X264_BUILD >= 79 p_sys->param.analyse.i_weighted_pred = X264_WEIGHTP_NONE; -#endif + p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE; } else if (!strcasecmp( psz_val, "main" ) ) { @@ -1110,34 +1197,28 @@ 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" ) ) + 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; + vlc_mutex_lock( &pthread_win32_mutex ); - 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 ); - - 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 /* Set lookahead value to lower than default, @@ -1185,21 +1266,27 @@ 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 ); + } } - x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic, &pic ); - if( !i_nal ) return NULL; @@ -1217,50 +1304,32 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict ) i_out += nal[i].i_payload; } - if( pic.i_type == X264_TYPE_IDR || pic.i_type == X264_TYPE_I ) + 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 1 /* XXX: remove me when 0 is a valid timestamp (see #3135) */ - 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; - } -#else - p_block->i_dts = p_sys->i_interpolated_dts; -#endif - 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; } @@ -1275,26 +1344,23 @@ 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; - - var_Get( p_enc->p_libvlc, "pthread_win32_mutex", &lock ); - vlc_mutex_lock( lock.p_address ); + vlc_mutex_lock( &pthread_win32_mutex ); + pthread_win32_count--; - 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 );