" - normal: Non-strict (not Blu-ray compatible)\n"\
)
+#define FULLRANGE_TEXT N_("Use fullrange instead of TV colorrange")
+#define FULLRANGE_LONGTEXT N_("TV-range is usually used colorrange, defining this to true " \
+ "will enable libx264 to use full colorrange on encoding")
+
#define CABAC_TEXT N_("CABAC")
#define CABAC_LONGTEXT N_( "CABAC (Context-Adaptive Binary Arithmetic "\
"Coding). Slightly slows down encoding and decoding, but should save " \
"(p4x4 requires p8x8. i8x8 requires 8x8dct).")
#define DIRECT_PRED_TEXT N_("Direct MV prediction mode")
-#define DIRECT_PRED_LONGTEXT N_( "Direct MV prediction mode.")
+#define DIRECT_PRED_LONGTEXT DIRECT_PRED_TEXT
#define DIRECT_PRED_SIZE_TEXT N_("Direct prediction size")
#define DIRECT_PRED_SIZE_LONGTEXT N_( "Direct prediction size: "\
"tradeoffs involved in the motion estimation decision process " \
"(lower = quicker and higher = better quality). Range 1 to 9." )
-#define B_RDO_TEXT N_("RD based mode decision for B-frames")
#define B_RDO_LONGTEXT N_( "RD based mode decision for B-frames. This " \
"requires subme 6 (or higher).")
#define CHROMA_ME_LONGTEXT N_( "Chroma ME for subpel and mode decision in " \
"P-frames.")
-#define BIME_TEXT N_("Jointly optimize both MVs in B-frames")
#define BIME_LONGTEXT N_( "Joint bidirectional motion refinement.")
#define TRANSFORM_8X8DCT_TEXT N_("Adaptive spatial transform size")
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") };
+ { N_("None"), N_("Fast"), N_("Normal"), N_("Slow"), N_("All") };
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") };
+ { N_("None"), N_("Spatial"), N_("Temporal"), N_("Auto") };
static const int const framepacking_list[] =
{ -1, 0, 1, 2, 3, 4, 5 };
vlc_module_begin ()
#ifdef MODULE_NAME_IS_x26410b
- set_description( N_("H.264/MPEG4 AVC encoder (x264 10-bit)"))
+ set_description( N_("H.264/MPEG-4 Part 10/AVC encoder (x264 10-bit)"))
set_capability( "encoder", 0 )
#else
- set_description( N_("H.264/MPEG4 AVC encoder (x264)"))
+ set_description( N_("H.264/MPEG-4 Part 10/AVC encoder (x264)"))
set_capability( "encoder", 200 )
#endif
set_callbacks( Open, Close )
#if X264_BUILD >= 102 && X264_BUILD <= 114
add_string( SOUT_CFG_PREFIX "opengop", "none", OPENGOP_TEXT,
OPENGOP_LONGTEXT, true )
- change_string_list( x264_open_gop_names, x264_open_gop_names, 0 );
+ change_string_list( x264_open_gop_names, x264_open_gop_names )
#elif X264_BUILD > 114
add_bool( SOUT_CFG_PREFIX "opengop", false, OPENGOP_TEXT,
OPENGOP_LONGTEXT, true )
add_string( SOUT_CFG_PREFIX "bpyramid", "none", BPYRAMID_TEXT,
BPYRAMID_LONGTEXT, true )
#endif
- change_string_list( bpyramid_list, bpyramid_list, 0 );
+ change_string_list( bpyramid_list, bpyramid_list )
add_bool( SOUT_CFG_PREFIX "cabac", true, CABAC_TEXT, CABAC_LONGTEXT,
true )
+ add_bool( SOUT_CFG_PREFIX "fullrange", false, FULLRANGE_TEXT, FULLRANGE_LONGTEXT,
+ true )
+
add_integer( SOUT_CFG_PREFIX "ref", 3, REF_TEXT,
REF_LONGTEXT, true )
change_integer_range( 1, 16 )
add_string( SOUT_CFG_PREFIX "profile", "high", PROFILE_TEXT,
PROFILE_LONGTEXT, false )
- change_string_list( x264_profile_names, x264_profile_names, 0 );
+ vlc_config_set (VLC_CONFIG_LIST,
+ (sizeof(x264_profile_names) / sizeof (char*)) - 1,
+ x264_profile_names, x264_profile_names);
+
add_bool( SOUT_CFG_PREFIX "interlaced", false, INTERLACED_TEXT, INTERLACED_LONGTEXT,
true )
#if X264_BUILD >= 89
add_string( SOUT_CFG_PREFIX "hrd", "none", HRD_TEXT, HRD_TEXT, true )
- change_string_list( x264_nal_hrd_names, x264_nal_hrd_names, 0 );
+ vlc_config_set (VLC_CONFIG_LIST,
+ (sizeof(x264_nal_hrd_names) / sizeof (char*)) - 1,
+ x264_nal_hrd_names, x264_nal_hrd_names);
#endif
/* x264 partitions = none (default). set at least "normal" mode. */
add_string( SOUT_CFG_PREFIX "partitions", "normal", ANALYSE_TEXT,
ANALYSE_LONGTEXT, true )
- change_string_list( enc_analyse_list, enc_analyse_list_text, 0 );
+ change_string_list( enc_analyse_list, enc_analyse_list_text )
add_string( SOUT_CFG_PREFIX "direct", "spatial", DIRECT_PRED_TEXT,
DIRECT_PRED_LONGTEXT, true )
- change_string_list( direct_pred_list, direct_pred_list_text, 0 );
+ change_string_list( direct_pred_list, direct_pred_list_text )
add_integer( SOUT_CFG_PREFIX "direct-8x8", 1, DIRECT_PRED_SIZE_TEXT,
DIRECT_PRED_SIZE_LONGTEXT, true )
add_string( SOUT_CFG_PREFIX "me", "hex", ME_TEXT,
ME_LONGTEXT, true )
- change_string_list( enc_me_list, enc_me_list_text, 0 );
+ change_string_list( enc_me_list, enc_me_list_text )
add_integer( SOUT_CFG_PREFIX "merange", 16, MERANGE_TEXT,
MERANGE_LONGTEXT, true )
STATS_LONGTEXT, true )
add_string( SOUT_CFG_PREFIX "preset", NULL , PRESET_TEXT , PRESET_TEXT, false )
- change_string_list( x264_preset_names, x264_preset_names, 0 );
+ vlc_config_set (VLC_CONFIG_LIST,
+ (sizeof(x264_preset_names) / sizeof (char*)) - 1,
+ x264_preset_names, x264_preset_names);
add_string( SOUT_CFG_PREFIX "tune", NULL , TUNE_TEXT, TUNE_TEXT, false )
- change_string_list( x264_tune_names, x264_tune_names, 0 );
+ vlc_config_set (VLC_CONFIG_LIST,
+ (sizeof(x264_tune_names) / sizeof (char*)) - 1,
+ x264_tune_names, x264_tune_names);
add_string( SOUT_CFG_PREFIX "options", NULL, X264_OPTIONS_TEXT,
X264_OPTIONS_LONGTEXT, true )
"aq-mode", "aq-strength", "psy-rd", "psy", "profile", "lookahead", "slices",
"slice-max-size", "slice-max-mbs", "intra-refresh", "mbtree", "hrd",
"tune","preset", "opengop", "bluray-compat", "frame-packing", "options",
+ "fullrange",
NULL
};
int i_qmin = 0, i_qmax = 0;
x264_nal_t *nal;
int i, i_nal;
+ bool fullrange = false;
if( p_enc->fmt_out.i_codec != VLC_CODEC_H264 &&
!p_enc->b_force )
if( !p_sys )
return VLC_ENOMEM;
- p_enc->fmt_in.i_codec = VLC_CODEC_I420;
+ fullrange = var_GetBool( p_enc, SOUT_CFG_PREFIX "fullrange" );
+ p_enc->fmt_in.i_codec = fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420;
p_sys->i_colorspace = X264_CSP_I420;
#if X264_BUILD >= 118
char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
if( !strcmp( psz_profile, "high10" ) )
{
- p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I420_10L : VLC_CODEC_I420;
+ p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I420_10L : fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420;
p_sys->i_colorspace = X264_CSP_I420 | mask;
}
else if( !strcmp( psz_profile, "high422" ) )
{
- p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I422_10L : VLC_CODEC_I422;
+ p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I422_10L : fullrange ? VLC_CODEC_J422 : VLC_CODEC_I422;
p_sys->i_colorspace = X264_CSP_I422 | mask;
}
else if( !strcmp( psz_profile, "high444" ) )
{
- p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I444_10L : VLC_CODEC_I444;
+ p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I444_10L : fullrange ? VLC_CODEC_J444 : VLC_CODEC_I444;
p_sys->i_colorspace = X264_CSP_I444 | mask;
}
#ifdef MODULE_NAME_IS_x26410b
p_sys->param.i_csp = p_sys->i_colorspace;
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.vui.b_fullrange = fullrange;
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" );
/* max bitrate = average bitrate -> CBR */
p_sys->param.rc.i_vbv_max_bitrate = var_GetInteger( p_enc, SOUT_CFG_PREFIX "vbv-maxrate" );
+ if( p_sys->param.rc.i_vbv_max_bitrate && p_sys->param.rc.i_rc_method != X264_RC_ABR )
+ p_enc->fmt_out.i_bitrate = p_sys->param.rc.i_vbv_max_bitrate * 1000;
if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "mbtree" ) )
p_sys->param.i_fps_den = p_enc->fmt_in.video.i_frame_rate_base;
p_sys->param.i_timebase_num = 1;
p_sys->param.i_timebase_den = INT64_C(1000000);
- p_sys->param.b_vfr_input = 1;
+ p_sys->param.b_vfr_input = 0;
}
/* Check slice-options */
/* Check if user has given some profile (baseline,main,high) to limit
* settings, and apply those*/
psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
- if( psz_val )
+ if( psz_val && *psz_val )
x264_param_apply_profile( &p_sys->param, psz_val );
free( psz_val );
#if defined (__i386__) || defined (__x86_64__)
- unsigned i_cpu = vlc_CPU();
if( !vlc_CPU_MMX() )
p_sys->param.cpu &= ~X264_CPU_MMX;
- if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
+ if( !vlc_CPU_MMXEXT() )
p_sys->param.cpu &= ~X264_CPU_MMXEXT;
- if( !(i_cpu & CPU_CAPABILITY_SSE) )
+ if( !vlc_CPU_SSE() )
p_sys->param.cpu &= ~X264_CPU_SSE;
- if( !(i_cpu & CPU_CAPABILITY_SSE2) )
+ if( !vlc_CPU_SSE2() )
p_sys->param.cpu &= ~X264_CPU_SSE2;
#endif
for( i = 0; i < i_nal; i++ )
i_out += nal[i].i_payload;
- p_block = block_New( p_enc, i_out + p_sys->i_sei_size );
+ p_block = block_Alloc( i_out + p_sys->i_sei_size );
if( !p_block ) return NULL;
unsigned int i_offset = 0;
p_block->i_flags |= BLOCK_FLAG_TYPE_I;
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 )
+ else if( IS_X264_TYPE_B( pic.i_type ) )
p_block->i_flags |= BLOCK_FLAG_TYPE_B;
else
p_block->i_flags |= BLOCK_FLAG_TYPE_PB;
projects / vlc / blobdiff