#include <assert.h>
+#ifdef MODULE_NAME_IS_x26410b
+#define SOUT_CFG_PREFIX "sout-x26410b-"
+#else
#define SOUT_CFG_PREFIX "sout-x264-"
+#endif
/*****************************************************************************
* Module descriptor
"Currently default can cause sync-issues on unmuxable output, like rtsp-output without ts-mux" )
#define HRD_TEXT N_("HRD-timing information")
-#define HRD_LONGTEXT N_("HRD-timing information")
+#define TUNE_TEXT N_("Default tune setting used" )
+#define PRESET_TEXT N_("Default preset setting used" )
-#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." )
+#define X264_OPTIONS_TEXT N_("x264 advanced options.")
+#define X264_OPTIONS_LONGTEXT N_("x264 advanced options, in the form {opt=val,op2=val2} .")
static const char *const enc_me_list[] =
{ "dia", "hex", "umh", "esa", "tesa" };
{ "", N_("checkerboard"), N_("column alternation"), N_("row alternation"), N_("side by side"), N_("top bottom"), N_("frame alternation") };
vlc_module_begin ()
+#ifdef MODULE_NAME_IS_x26410b
+ set_description( N_("H.264/MPEG4 AVC encoder (x264 10-bit)"))
+ set_capability( "encoder", 0 )
+#else
set_description( N_("H.264/MPEG4 AVC encoder (x264)"))
set_capability( "encoder", 200 )
+#endif
set_callbacks( Open, Close )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_VCODEC )
#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_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 )
add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, SLICE_MAX_MBS, SLICE_MAX_MBS_LONGTEXT, true )
#if X264_BUILD >= 89
- add_string( SOUT_CFG_PREFIX "hrd", "none", HRD_TEXT, HRD_LONGTEXT, true )
- change_string_list( x264_nal_hrd_names, x264_nal_hrd_names, 0 );
+ add_string( SOUT_CFG_PREFIX "hrd", "none", HRD_TEXT, HRD_TEXT, true )
+ 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 )
vlc_module_end ()
"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", "bluray-compat", "frame-packing", NULL
+ "tune","preset", "opengop", "bluray-compat", "frame-packing", "options",
+ NULL
};
static block_t *Encode( encoder_t *, picture_t * );
if( psz_profile )
{
const int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;
+
+#ifdef MODULE_NAME_IS_x26410b
+ if( mask == 0)
+ {
+ msg_Err( p_enc, "Only high bith depth encoding supported, bit depth:%d", x264_bit_depth);
+ return VLC_EGENERIC;
+ }
+#endif
+
if( !strcmp( psz_profile, "high10" ) )
{
p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I420_10L : VLC_CODEC_I420;
p_sys->i_colorspace = X264_CSP_I420 | mask;
}
- if( !strcmp( psz_profile, "high422" ) )
+ else if( !strcmp( psz_profile, "high422" ) )
{
p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I422_10L : VLC_CODEC_I422;
p_sys->i_colorspace = X264_CSP_I422 | mask;
}
- if( !strcmp( psz_profile, "high444" ) )
+ else if( !strcmp( psz_profile, "high444" ) )
{
p_enc->fmt_in.i_codec = mask ? VLC_CODEC_I444_10L : VLC_CODEC_I444;
p_sys->i_colorspace = X264_CSP_I444 | mask;
}
+#ifdef MODULE_NAME_IS_x26410b
+ else
+ {
+ msg_Err( p_enc, "Only high-profiles and 10-bit are supported");
+ return VLC_EGENERIC;
+ }
+
+#endif
+ }
+#ifdef MODULE_NAME_IS_x26410b
+ else
+ {
+ msg_Err( p_enc, "Only high-profiles and 10-bit are supported");
+ return VLC_EGENERIC;
}
+#endif
free( psz_profile );
#endif //X264_BUILD
/* 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_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.i_timebase_num = 1;
+ p_sys->param.i_timebase_den = INT64_C(1000000);
p_sys->param.b_vfr_input = 0;
}
/* 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 );
-
- unsigned i_cpu = vlc_CPU();
- if( !(i_cpu & CPU_CAPABILITY_MMX) )
- {
+#if defined (__i386__) || defined (__x86_64__)
+ 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
/* BUILD 29 adds support for multi-threaded encoding while BUILD 49 (r543)
also adds support for threads = 0 for automatically selecting an optimal
/* We don't want repeated headers, we repeat p_extra ourself if needed */
p_sys->param.b_repeat_headers = 0;
+ char *psz_opts = var_InheritString( p_enc, SOUT_CFG_PREFIX "options" );
+ if (psz_opts && *psz_opts) {
+ config_chain_t *cfg = NULL;
+ config_ChainParseOptions(&cfg, psz_opts);
+ while (cfg) {
+ config_chain_t *next = cfg->p_next;
+ char *name = cfg->psz_name;
+ char *value = cfg->psz_value;
+ int ret = x264_param_parse(&p_sys->param, name, value);
+ if (ret == X264_PARAM_BAD_NAME) {
+ msg_Err(p_enc, "Unknown option \"%s\"", name);
+ } else if (ret == X264_PARAM_BAD_VALUE) {
+ msg_Err(p_enc, "Bad value \"%s\" for option \"%s\"", value, name);
+ }
+ free(name);
+ free(value);
+ free(cfg);
+ cfg = next;
+ }
+ }
+ free(psz_opts);
+
/* Open the encoder */
p_sys->h = x264_encoder_open( &p_sys->param );
projects / vlc / blobdiff