/*****************************************************************************
* x264.c: h264 video encoder
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
#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 preiod for the maximum " \
+#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")
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 );
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();
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 )
{
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 >> 4 << 4;
- p_sys->param.i_height = p_enc->fmt_in.video.i_height >> 4 << 4;
+ 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 >= 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" ) )
{
-#ifndef X264_ANALYSE_BSUB16x16
-# define X264_ANALYSE_BSUB16x16 0
-#endif
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 );
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