#ifdef PTW32_STATIC_LIB
#include <pthread.h>
#endif
+#ifdef MODULE_NAME_IS_x262
+#include <x262.h>
+#else
#include <x264.h>
+#endif
#include <assert.h>
#ifdef MODULE_NAME_IS_x26410b
#define SOUT_CFG_PREFIX "sout-x26410b-"
-#else
+#endif
+#ifdef MODULE_NAME_IS_x262
+#define SOUT_CFG_PREFIX "sout-x262-"
+#endif
+#ifdef MODULE_NAME_IS_x264
#define SOUT_CFG_PREFIX "sout-x264-"
#endif
" - 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[] =
+static const int framepacking_list[] =
{ -1, 0, 1, 2, 3, 4, 5 };
static const char *const framepacking_list_text[] =
{ "", 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_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)"))
+#endif
+#ifdef MODULE_NAME_IS_x262
+ set_description( N_("H.262/MPEG-2 encoder (x262)"))
+ set_capability( "encoder", 0 )
+#endif
+#ifdef MODULE_NAME_IS_x264
+ set_description( N_("H.264/MPEG-4 Part 10/AVC encoder (x264)"))
set_capability( "encoder", 200 )
#endif
set_callbacks( Open, Close )
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 )
"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;
+#ifdef MODULE_NAME_IS_x262
+ if( p_enc->fmt_out.i_codec != VLC_CODEC_MP2V &&
+#else
if( p_enc->fmt_out.i_codec != VLC_CODEC_H264 &&
+#endif
!p_enc->b_force )
{
return VLC_EGENERIC;
}
/* X264_POINTVER or X264_VERSION are not available */
+#ifdef MODULE_NAME_IS_x262
+ msg_Dbg ( p_enc, "version x262 0.%d.X", X264_BUILD );
+#else
msg_Dbg ( p_enc, "version x264 0.%d.X", X264_BUILD );
+#endif
config_ChainParse( p_enc, SOUT_CFG_PREFIX, ppsz_sout_options, p_enc->p_cfg );
p_enc->fmt_out.i_cat = VIDEO_ES;
+#ifdef MODULE_NAME_IS_x262
+ p_enc->fmt_out.i_codec = VLC_CODEC_MP2V;
+#else
p_enc->fmt_out.i_codec = VLC_CODEC_H264;
+#endif
p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) );
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" );
{
const int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;
-#ifdef MODULE_NAME_IS_x26410b
+
+# 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
+# endif
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
+# ifdef MODULE_NAME_IS_x26410b
else
{
msg_Err( p_enc, "Only high-profiles and 10-bit are supported");
return VLC_EGENERIC;
}
-#endif
+# endif
}
-#ifdef MODULE_NAME_IS_x26410b
+# ifdef MODULE_NAME_IS_x26410b
else
{
msg_Err( p_enc, "Only high-profiles and 10-bit are supported");
return VLC_EGENERIC;
}
-#endif
+# endif
free( psz_profile );
#endif //X264_BUILD
p_sys->i_sei_size = 0;
p_sys->p_sei = 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;
}
+#ifdef MODULE_NAME_IS_x262
+ p_sys->param.b_mpeg2 = true;
+ x264_param_default_mpeg2( &p_sys->param );
+ x264_param_default_preset_mpeg2( &p_sys->param, psz_preset, psz_tune );
+#else
+ x264_param_default( &p_sys->param );
x264_param_default_preset( &p_sys->param, psz_preset, psz_tune );
+#endif
free( psz_preset );
free( psz_tune );
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.i_width = p_enc->fmt_in.video.i_visible_width;
+ p_sys->param.i_height = p_enc->fmt_in.video.i_visible_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_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 = 1;
+ p_sys->param.i_timebase_den = CLOCK_FREQ;
+ 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 );
i_level = VLC_MSG_INFO;
break;
case X264_LOG_DEBUG:
- i_level = VLC_MSG_DBG;
default:
i_level = VLC_MSG_DBG;
}
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;
/* This isn't really valid for streams with B-frames */
- p_block->i_length = INT64_C(1000000) *
+ p_block->i_length = CLOCK_FREQ *
p_enc->fmt_in.video.i_frame_rate_base /
p_enc->fmt_in.video.i_frame_rate;
free( p_sys->psz_stat_name );
free( p_sys->p_sei );
- msg_Dbg( p_enc, "framecount still in libx264 buffer: %d", x264_encoder_delayed_frames( p_sys->h ) );
-
if( p_sys->h )
+ {
+ msg_Dbg( p_enc, "framecount still in libx264 buffer: %d", x264_encoder_delayed_frames( p_sys->h ) );
x264_encoder_close( p_sys->h );
+ }
#ifdef PTW32_STATIC_LIB
vlc_mutex_lock( &pthread_win32_mutex );
projects / vlc / blobdiff