/*****************************************************************************
* x264.c: h264 video encoder
*****************************************************************************
- * Copyright (C) 2004-2006 the VideoLAN team
+ * Copyright (C) 2004-2010 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
#include <vlc_codec.h>
#include <vlc_charset.h>
#include <vlc_cpu.h>
+#include <math.h>
#ifdef PTW32_STATIC_LIB
#include <pthread.h>
"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")
+#define OPENGOP_LONGTEXT N_("none: use closed GOPs only\n"\
+ "normal: use standard open GOPs\n" \
+ "bluray: use Blu-ray compatible open GOPs" )
+
#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 " \
#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 "\
#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" \
#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")
#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")
#define ME_LONGTEXT N_( "Selects the motion estimation algorithm: "\
" - dia: diamond search, radius 1 (fast)\n" \
#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." )
#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. " \
#define AUD_TEXT N_("Access unit delimiters")
#define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.")
+#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." )
+
static const char *const enc_me_list[] =
{ "dia", "hex", "umh", "esa", "tesa" };
static const char *const enc_me_list_text[] =
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[] =
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 */
+
+#if X264_BUILD >= 102
+ add_string( SOUT_CFG_PREFIX "opengop", "none", NULL, OPENGOP_TEXT,
+ OPENGOP_LONGTEXT,false )
+ change_string_list( x264_open_gop_names, x264_open_gop_names, 0 );
+#endif
add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT,
SCENE_LONGTEXT, false )
B_BIAS_LONGTEXT, false )
change_integer_range( -100, 100 )
- add_bool( SOUT_CFG_PREFIX "bpyramid", false, NULL, BPYRAMID_TEXT,
+#if X264_BUILD >= 87
+ add_string( SOUT_CFG_PREFIX "bpyramid", "normal", NULL, BPYRAMID_TEXT,
BPYRAMID_LONGTEXT, false )
+#else
+ 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 )
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,
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 )
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 )
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 )
add_bool( SOUT_CFG_PREFIX "weightb", true, NULL, WEIGHTB_TEXT,
WEIGHTB_LONGTEXT, false )
+ 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 );
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" )
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,
TRELLIS_LONGTEXT, false )
change_integer_range( 0, 2 )
+ 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 )
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", "opengop", NULL
};
static block_t *Encode( encoder_t *, picture_t * );
x264_t *h;
x264_param_t param;
- int i_buffer;
- uint8_t *p_buffer;
-
- mtime_t i_interpolated_dts;
+ mtime_t i_initial_delay;
- char *psz_stat_name;
+ 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
*****************************************************************************/
{
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;
/* X264_POINTVER or X264_VERSION are not available */
msg_Dbg ( p_enc, "version x264 0.%d.X", X264_BUILD );
- if( X264_BUILD < 76 )
- {
- msg_Warn( p_enc, "x264 version needs to be 0.76 or higher");
- return VLC_EGENERIC;
- }
-
-
config_ChainParse( p_enc, SOUT_CFG_PREFIX, ppsz_sout_options, p_enc->p_cfg );
p_enc->fmt_out.i_cat = VIDEO_ES;
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;
- 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 */
}
else /* Set default to CRF */
{
- 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 )
{
- p_sys->param.rc.f_rf_constant = val.i_int;
+ p_sys->param.rc.f_rf_constant = i_val;
p_sys->param.rc.i_rc_method = X264_RC_CRF;
}
}
- 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;
- 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;
}
- 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 );
+ i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" );
- if( !val.i_int && p_sys->param.rc.i_rc_method == X264_RC_ABR )
+ 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 ( val.i_int )
- p_sys->param.rc.i_vbv_max_bitrate = val.i_int;
+ 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 );
}
- 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 );
}
+ 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 );
}
- var_Get( p_enc, SOUT_CFG_PREFIX "interlaced", &val );
- p_sys->param.b_interlaced = val.b_bool;
-
- 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;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "qblur", &val );
- p_sys->param.rc.f_qblur = val.f_float;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "aq-mode", &val );
- p_sys->param.rc.i_aq_mode = val.i_int;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "aq-strength", &val );
- p_sys->param.rc.f_aq_strength = val.f_float;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "verbose", &val );
- if( val.b_bool ) p_sys->param.i_log_level = X264_LOG_DEBUG;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "quiet", &val );
- if( val.b_bool ) p_sys->param.i_log_level = X264_LOG_NONE;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "sps-id", &val );
- if( val.i_int >= 0 ) p_sys->param.i_sps_id = val.i_int;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "aud", &val );
- if( val.b_bool ) p_sys->param.b_aud = val.b_bool;
+ 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" );
+
+ if( var_GetBool( p_enc, SOUT_CFG_PREFIX "verbose" ) )
+ p_sys->param.i_log_level = X264_LOG_DEBUG;
+
+ if( var_GetBool( p_enc, SOUT_CFG_PREFIX "quiet" ) )
+ p_sys->param.i_log_level = X264_LOG_NONE;
+
+ i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "sps-id" );
+ if( i_val >= 0 ) p_sys->param.i_sps_id = i_val;
+
+ if( var_GetBool( p_enc, SOUT_CFG_PREFIX "aud" ) )
+ p_sys->param.b_aud = true;
+
+ 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;
+
+ 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
+ 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 );
+#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 "keyint", &val );
- if( val.i_int > 0 ) p_sys->param.i_keyint_max = val.i_int;
+ p_sys->param.b_intra_refresh = var_GetBool( p_enc, SOUT_CFG_PREFIX "intra-refresh" );
- var_Get( p_enc, SOUT_CFG_PREFIX "min-keyint", &val );
- if( val.i_int > 0 ) p_sys->param.i_keyint_min = val.i_int;
+ psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "bpyramid" );
+ if( !strcmp( psz_val, "normal" ) )
+ {
+ 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, "none" ) )
+ {
+ p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
+ }
- 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;
+ free( psz_val );
- var_Get( p_enc, SOUT_CFG_PREFIX "bpyramid", &val );
- p_sys->param.b_bframe_pyramid = val.b_bool;
+ 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( val.i_int >= -1 && val.i_int <= 100 )
- p_sys->param.i_scenecut_threshold = val.i_int;
+ p_sys->param.b_deterministic = var_GetBool( p_enc,
+ SOUT_CFG_PREFIX "non-deterministic" );
- var_Get( p_enc, SOUT_CFG_PREFIX "non-deterministic", &val );
- p_sys->param.b_deterministic = val.b_bool;
+ 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;
- 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 >= 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 "me", &val );
- if( !strcmp( val.psz_string, "dia" ) )
+ //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_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;
- }
- else if( !strcmp( val.psz_string, "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( 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;
- var_Get( p_enc, SOUT_CFG_PREFIX "mvrange", &val );
- p_sys->param.analyse.i_mv_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-thread", &val );
- p_sys->param.analyse.i_mv_range_thread = val.i_int;
+ 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;
}
- 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;
}
- free( val.psz_string );
-
- var_Get( p_enc, SOUT_CFG_PREFIX "psnr", &val );
- p_sys->param.analyse.b_psnr = val.b_bool;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "ssim", &val );
- p_sys->param.analyse.b_ssim = val.b_bool;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "weightb", &val );
- p_sys->param.analyse.b_weighted_bipred = val.b_bool;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "b-adapt", &val );
- p_sys->param.i_bframe_adaptive = val.i_int;
-
- 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;
-
- 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;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "mixed-refs", &val );
- p_sys->param.analyse.b_mixed_references = val.b_bool;
-
-
- 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;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "fast-pskip", &val );
- p_sys->param.analyse.b_fast_pskip = val.b_bool;
-
-
- 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;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "dct-decimate", &val );
- p_sys->param.analyse.b_dct_decimate = val.b_bool;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "deadzone-inter", &val );
- if( val.i_int >= 0 && val.i_int <= 32 )
- p_sys->param.analyse.i_luma_deadzone[0] = val.i_int;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "deadzone-intra", &val );
- if( val.i_int >= 0 && val.i_int <= 32 )
- p_sys->param.analyse.i_luma_deadzone[1] = val.i_int;
-
- var_Get( p_enc, SOUT_CFG_PREFIX "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 |
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 |
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 );
- var_Get( p_enc, SOUT_CFG_PREFIX "8x8dct", &val );
- p_sys->param.analyse.b_transform_8x8 = val.b_bool;
+ 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;
}
{
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.
/* 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;
+ p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_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();
default unless ofcourse transcode threads is explicitly specified.. */
p_sys->param.i_threads = p_enc->i_threads;
- 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
/* 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;
+ 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 );
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;
Close( VLC_OBJECT(p_enc) );
return VLC_ENOMEM;
}
- void *p_tmp = p_enc->fmt_out.p_extra;
+ 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 );
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 */
+#if X264_BUILD >= 98
+ x264_picture_init( &pic );
+#else
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;
+#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++ )
+ {
+ 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;
+
+ /* Get size of block we need */
for( i = 0, i_out = 0; i < i_nal; i++ )
- {
- memcpy( p_sys->p_buffer + i_out, nal[i].p_payload, nal[i].i_payload );
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
- {
- p_block->i_dts = p_block->i_pts;
- }
+ /* 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;
return p_block;
}
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->p_buffer );
free( p_sys );
}
projects / vlc / blobdiff