/*****************************************************************************
* x264.c: h264 video encoder
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
#define ANALYSE_TEXT N_("Analyse mode")
#define ANALYSE_LONGTEXT N_( "This selects the analysing mode.")
+#define TOLERANCE_TEXT N_("Bitrate tolerance")
+#define TOLERANCE_LONGTEXT N_( "Sets the allowed variance in average " \
+ "bitrate.")
+
+#define VBV_MAXRATE_TEXT N_("Maximum local bitrate")
+#define VBV_MAXRATE_LONGTEXT N_( "Sets a maximum local bitrate in kbits/s.")
+
+#define VBV_BUFSIZE_TEXT N_("Averaging period for the maximum local bitrate")
+#define VBV_BUFSIZE_LONGTEXT N_( "Sets an averaging period for the maximum " \
+ "local bitrate, in kbits/s.")
+
+#define VBV_INIT_TEXT N_("Initial buffer occupancy")
+#define VBV_INIT_LONGTEXT N_( "Sets the initial buffer occupancy as a " \
+ "fraction of the buffer size.")
+
#define KEYINT_TEXT N_("Sets maximum interval between IDR-frames")
#define KEYINT_LONGTEXT N_( "Larger values save bits, thus improve quality "\
"for a given bitrate, at the cost of seeking precision." )
#define BFRAMES_LONGTEXT N_( "Number of consecutive B-Frames between I and " \
"P-frames." )
+#define BPYRAMID_TEXT N_("B pyramid")
+#define BPYRAMID_LONGTEXT N_( "Allows B-frames to be used as references for " \
+ "predicting other frames." )
+
#define FRAMEREF_TEXT N_("Number of previous frames used as predictors.")
#define FRAMEREF_LONGTEXT N_( "This is effective in Anime, but seems to " \
"make little difference in live-action source material. Some decoders " \
"-1 disables scene-cut detection, so I-frames are be inserted only every "\
"other keyint frames, which probably leads to ugly encoding artifacts." )
+#define SUBPEL_TEXT N_("Sub-pixel refinement quality.")
+#define SUBPEL_LONGTEXT N_( "This parameter controls quality versus speed " \
+ "tradeoffs involved in the motion estimation decision process " \
+ "(lower = quicker and higher = better quality)." )
+
static char *enc_analyse_list[] =
{ "", "all", "normal", "fast", "none" };
static char *enc_analyse_list_text[] =
- { N_("default"), N_("all"), N_("normal"), N_("fast"), N_("none") };
+ { N_("default"), N_("all"), N_("slow"), N_("normal"),
+ N_("fast"), N_("none") };
vlc_module_begin();
- set_description( _("h264 video encoder using x264 library"));
+ set_description( _("H264 encoder (using x264 library)"));
set_capability( "encoder", 200 );
set_callbacks( Open, Close );
set_category( CAT_INPUT );
ANALYSE_LONGTEXT, VLC_FALSE );
change_string_list( enc_analyse_list, enc_analyse_list_text, 0 );
+ add_float( SOUT_CFG_PREFIX "tolerance", 1.0, NULL, TOLERANCE_TEXT,
+ TOLERANCE_LONGTEXT, VLC_FALSE );
+ change_float_range( 0, 100 );
+
+ add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT,
+ VBV_MAXRATE_LONGTEXT, VLC_FALSE );
+
+ add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, NULL, VBV_BUFSIZE_TEXT,
+ VBV_BUFSIZE_LONGTEXT, VLC_FALSE );
+
+ add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT,
+ VBV_INIT_LONGTEXT, VLC_FALSE );
+ change_float_range( 0, 1 );
+
add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT,
KEYINT_LONGTEXT, VLC_FALSE );
BFRAMES_LONGTEXT, VLC_FALSE );
change_integer_range( 0, 16 );
+ add_bool( SOUT_CFG_PREFIX "bpyramid", 0, NULL, BPYRAMID_TEXT,
+ BPYRAMID_LONGTEXT, VLC_FALSE );
+
add_integer( SOUT_CFG_PREFIX "frameref", 1, NULL, FRAMEREF_TEXT,
FRAMEREF_LONGTEXT, VLC_FALSE );
change_integer_range( 1, 15 );
SCENE_LONGTEXT, VLC_FALSE );
change_integer_range( -1, 100 );
+#if X264_BUILD >= 30
+ add_integer( SOUT_CFG_PREFIX "subpel", 6, NULL, SUBPEL_TEXT,
+ SUBPEL_LONGTEXT, VLC_FALSE );
+ change_integer_range( 1, 6 );
+#else
+ add_integer( SOUT_CFG_PREFIX "subpel", 5, NULL, SUBPEL_TEXT,
+ SUBPEL_LONGTEXT, VLC_FALSE );
+ change_integer_range( 1, 5 );
+#endif
+
vlc_module_end();
/*****************************************************************************
*****************************************************************************/
static const char *ppsz_sout_options[] = {
"qp", "qp-min", "qp-max", "cabac", "loopfilter", "analyse",
- "keyint", "keyint-min", "bframes", "frameref", "scenecut", NULL
+ "keyint", "keyint-min", "bframes", "bpyramid", "frameref", "scenecut",
+ "subpel", "tolerance", "vbv-maxrate", "vbv-bufsize", "vbv-init", NULL
};
static block_t *Encode( encoder_t *, picture_t * );
int i_buffer;
uint8_t *p_buffer;
+
+ mtime_t i_last_ref_pts;
};
/*****************************************************************************
return VLC_EGENERIC;
}
+#if X264_BUILD < 37
if( p_enc->fmt_in.video.i_width % 16 != 0 ||
p_enc->fmt_in.video.i_height % 16!= 0 )
{
- msg_Warn( p_enc, "invalid size %ix%i",
- p_enc->fmt_in.video.i_width,
- p_enc->fmt_in.video.i_height );
- return VLC_EGENERIC;
+ msg_Warn( p_enc, "size is not a multiple of 16 (%ix%i)",
+ p_enc->fmt_in.video.i_width, p_enc->fmt_in.video.i_height );
+
+ if( p_enc->fmt_in.video.i_width < 16 ||
+ p_enc->fmt_in.video.i_height < 16 )
+ {
+ msg_Err( p_enc, "video is too small to be cropped" );
+ return VLC_EGENERIC;
+ }
+
+ msg_Warn( p_enc, "cropping video to %ix%i",
+ p_enc->fmt_in.video.i_width >> 4 << 4,
+ p_enc->fmt_in.video.i_height >> 4 << 4 );
}
+#endif
sout_CfgParse( p_enc, SOUT_CFG_PREFIX, ppsz_sout_options, p_enc->p_cfg );
p_enc->pf_encode_video = Encode;
p_enc->pf_encode_audio = NULL;
p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) );
+ p_sys->i_last_ref_pts = 0;
x264_param_default( &p_sys->param );
p_sys->param.i_width = p_enc->fmt_in.video.i_width;
p_sys->param.i_height = p_enc->fmt_in.video.i_height;
+#if X264_BUILD < 37
+ p_sys->param.i_width = p_sys->param.i_width >> 4 << 4;
+ p_sys->param.i_height = p_sys->param.i_height >> 4 << 4;
+#endif
var_Get( p_enc, SOUT_CFG_PREFIX "qp-min", &val );
if( val.i_int >= 1 && val.i_int <= 51 ) i_qmin = val.i_int;
#if X264_BUILD >= 0x000a
p_sys->param.rc.b_cbr = 1;
p_sys->param.rc.i_bitrate = p_enc->fmt_out.i_bitrate / 1000;
+
+#if X264_BUILD >= 24
+ var_Get( p_enc, SOUT_CFG_PREFIX "tolerance", &val );
+ p_sys->param.rc.f_rate_tolerance = val.f_float;
+
+ var_Get( p_enc, SOUT_CFG_PREFIX "vbv-maxrate", &val );
+ p_sys->param.rc.i_vbv_max_bitrate = val.i_int;
+
+ var_Get( p_enc, SOUT_CFG_PREFIX "vbv-bufsize", &val );
+ p_sys->param.rc.i_vbv_buffer_size = val.i_int;
+ if( !val.i_int )
+ p_sys->param.rc.i_vbv_buffer_size = p_sys->param.rc.i_bitrate;
+
+ var_Get( p_enc, SOUT_CFG_PREFIX "vbv-init", &val );
+ p_sys->param.rc.f_vbv_buffer_init = val.f_float;
+#else
p_sys->param.rc.i_rc_buffer_size = p_sys->param.rc.i_bitrate;
p_sys->param.rc.i_rc_init_buffer = p_sys->param.rc.i_bitrate / 4;
+#endif
#endif
}
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;
+#if X264_BUILD >= 22
+ var_Get( p_enc, SOUT_CFG_PREFIX "bpyramid", &val );
+ p_sys->param.b_bframe_pyramid = val.b_bool;
+#endif
+
var_Get( p_enc, SOUT_CFG_PREFIX "frameref", &val );
if( val.i_int > 0 && val.i_int <= 15 )
p_sys->param.i_frame_reference = val.i_int;
p_sys->param.i_scenecut_threshold = val.i_int;
#endif
+#if X264_BUILD >= 22
+ var_Get( p_enc, SOUT_CFG_PREFIX "subpel", &val );
+#if X264_BUILD >= 30
+ if( val.i_int >= 1 && val.i_int <= 6 )
+#else
+ if( val.i_int >= 1 && val.i_int <= 5 )
+#endif
+ p_sys->param.analyse.i_subpel_refine = val.i_int;
+#endif
+
+#ifndef X264_ANALYSE_BSUB16x16
+# define X264_ANALYSE_BSUB16x16 0
+#endif
var_Get( p_enc, SOUT_CFG_PREFIX "analyse", &val );
if( !strcmp( val.psz_string, "none" ) )
{
p_sys->param.analyse.inter =
X264_ANALYSE_I4x4 | X264_ANALYSE_PSUB16x16;
}
+ else if( !strcmp( val.psz_string, "slow" ) )
+ {
+ p_sys->param.analyse.inter =
+ X264_ANALYSE_I4x4 |
+ X264_ANALYSE_PSUB16x16 | X264_ANALYSE_PSUB8x8 |
+ X264_ANALYSE_BSUB16x16;
+ }
else if( !strcmp( val.psz_string, "all" ) )
{
p_sys->param.analyse.inter =
- X264_ANALYSE_I4x4 | X264_ANALYSE_PSUB16x16 | X264_ANALYSE_PSUB8x8;
+ X264_ANALYSE_I4x4 |
+ X264_ANALYSE_PSUB16x16 | X264_ANALYSE_PSUB8x8 |
+ X264_ANALYSE_BSUB16x16;
+#ifdef X264_ANALYSE_I8x8
+ p_sys->param.analyse.inter |= X264_ANALYSE_I8x8;
+ p_sys->param.analyse.b_transform_8x8 = 1;
+#endif
}
+ if( val.psz_string ) free( val.psz_string );
if( p_enc->fmt_in.video.i_aspect > 0 )
{
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_reduce( &i_dst_num, &i_dst_den, i_num, i_den, 0 );
+ vlc_ureduce( &i_dst_num, &i_dst_den, i_num, i_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.cpu &= ~X264_CPU_SSE2;
}
+#if X264_BUILD >= 29
+ if( p_enc->i_threads >= 1 )
+ p_sys->param.i_threads = p_enc->i_threads;
+#endif
+
/* Open the encoder */
p_sys->h = x264_encoder_open( &p_sys->param );
/* 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++ )
#else
x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic );
#endif
+
+ if( !i_nal ) return NULL;
+
for( i = 0, i_out = 0; i < i_nal; i++ )
{
int i_size = p_sys->i_buffer - i_out;
}
p_block = block_New( p_enc, i_out );
- p_block->i_dts = p_pict->date;
- p_block->i_pts = p_pict->date;
memcpy( p_block->p_buffer, p_sys->p_buffer, i_out );
if( pic.i_type == X264_TYPE_IDR || pic.i_type == X264_TYPE_I )
else if( pic.i_type == X264_TYPE_B )
p_block->i_flags |= BLOCK_FLAG_TYPE_B;
+ /* This isn't really valid for streams with B-frames */
+ p_block->i_length = I64C(1000000) *
+ p_enc->fmt_in.video.i_frame_rate_base /
+ p_enc->fmt_in.video.i_frame_rate;
+
+ p_block->i_dts = p_block->i_pts = pic.i_pts;
+
+ if( p_sys->param.i_bframe > 0 )
+ {
+ if( p_block->i_flags & BLOCK_FLAG_TYPE_B )
+ {
+ p_block->i_dts = p_block->i_pts;
+ }
+ else
+ {
+ if( p_sys->i_last_ref_pts )
+ {
+ p_block->i_dts = p_sys->i_last_ref_pts;
+ }
+ else
+ {
+ /* Let's put something sensible */
+ p_block->i_dts = p_block->i_pts;
+ }
+
+ p_sys->i_last_ref_pts = p_block->i_pts;
+ }
+ }
+
return p_block;
}
/*****************************************************************************
- * CloseEncoder: ffmpeg encoder destruction
+ * CloseEncoder: x264 encoder destruction
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
projects / vlc / blobdiff