/*****************************************************************************
* x264.c: h264 video encoder
*****************************************************************************
- * Copyright (C) 2004-2006 the VideoLAN team
+ * Copyright (C) 2004-2010 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
#define BPYRAMID_TEXT N_("Keep some B-frames as references")
-#if X264_BUILD >= 78
#define BPYRAMID_LONGTEXT N_( "Allows B-frames to be used as references for " \
"predicting other frames. Keeps the middle of 2+ consecutive B-frames " \
"as a reference, and reorders frame appropriately.\n" \
" - strict: Strictly hierarchical pyramid\n" \
" - normal: Non-strict (not Blu-ray compatible)\n"\
)
-#else
-#define BPYRAMID_LONGTEXT N_( "Allows B-frames to be used as references for " \
- "predicting other frames. Keeps the middle of 2+ consecutive B-frames " \
- "as a reference, and reorders frame appropriately." )
-#endif
#define CABAC_TEXT N_("CABAC")
#define CABAC_LONGTEXT N_( "CABAC (Context-Adaptive Binary Arithmetic "\
#define LEVEL_LONGTEXT N_( "Specify H.264 level (as defined by Annex A " \
"of the standard). Levels are not enforced; it's up to the user to select " \
"a level compatible with the rest of the encoding options. Range 1 to 5.1 " \
- "(10 to 51 is also allowed).")
+ "(10 to 51 is also allowed). Set to 0 for letting x264 set level.")
#define PROFILE_TEXT N_("H.264 profile")
#define PROFILE_LONGTEXT N_("Specify H.264 profile which limits are enforced over" \
#define HRD_TEXT N_("HRD-timing information")
#define HRD_LONGTEXT N_("HRD-timing information")
+#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." )
+
static const char *const enc_me_list[] =
{ "dia", "hex", "umh", "esa", "tesa" };
static const char *const enc_me_list_text[] =
static const char *const profile_list[] =
{ "baseline", "main", "high" };
-#if X264_BUILD >= 78
static const char *const bpyramid_list[] =
{ "none", "strict", "normal" };
-#endif
static const char *const enc_analyse_list[] =
{ "none", "fast", "normal", "slow", "all" };
B_BIAS_LONGTEXT, false )
change_integer_range( -100, 100 )
-#if X264_BUILD >= 78
add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT,
BPYRAMID_LONGTEXT, false )
change_string_list( bpyramid_list, bpyramid_list, 0 );
-#else
- add_bool( SOUT_CFG_PREFIX "bpyramid", false, NULL, BPYRAMID_TEXT,
- BPYRAMID_LONGTEXT, false )
-#endif
add_bool( SOUT_CFG_PREFIX "cabac", true, NULL, CABAC_TEXT, CABAC_LONGTEXT,
false )
add_string( SOUT_CFG_PREFIX "profile", "high", NULL, PROFILE_TEXT,
PROFILE_LONGTEXT, false )
- change_string_list( profile_list, profile_list, 0 );
+ change_string_list( x264_profile_names, x264_profile_names, 0 );
add_bool( SOUT_CFG_PREFIX "interlaced", false, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT,
false )
add_obsolete_bool( SOUT_CFG_PREFIX "bime" )
- add_bool( SOUT_CFG_PREFIX "8x8dct", false, NULL, TRANSFORM_8X8DCT_TEXT,
+ add_bool( SOUT_CFG_PREFIX "8x8dct", true, NULL, TRANSFORM_8X8DCT_TEXT,
TRANSFORM_8X8DCT_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "trellis", 1, NULL, TRELLIS_TEXT,
add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT,
STATS_LONGTEXT, false )
-
- add_string( SOUT_CFG_PREFIX "preset", NULL , NULL, NULL, NULL, false )
+
+ add_string( SOUT_CFG_PREFIX "preset", NULL , NULL, PRESET_TEXT , PRESET_TEXT, false )
change_string_list( x264_preset_names, x264_preset_names, 0 );
- add_string( SOUT_CFG_PREFIX "tune", NULL , NULL, NULL, NULL, false )
+ add_string( SOUT_CFG_PREFIX "tune", NULL , NULL, TUNE_TEXT, TUNE_TEXT, false )
change_string_list( x264_tune_names, x264_tune_names, 0 );
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",NULL
+ "tune","preset", NULL
};
static block_t *Encode( encoder_t *, picture_t * );
x264_t *h;
x264_param_t param;
-#if X264_BUILD >= 83
int i_initial_delay;
-#else
- mtime_t i_interpolated_dts;
-#endif
char *psz_stat_name;
};
p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
-#if X264_BUILD >= 83
p_sys->i_initial_delay = 0;
-#else
- p_sys->i_interpolated_dts = 0;
-#endif
p_sys->psz_stat_name = NULL;
x264_param_default( &p_sys->param );
if( i_val >= 0 && i_val <= 16 && i_val != 3 )
p_sys->param.i_bframe = i_val;
-#if X264_BUILD >= 82
p_sys->param.b_intra_refresh = var_GetBool( p_enc, SOUT_CFG_PREFIX "intra-refresh" );
-#endif
-#if X264_BUILD >= 78
psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "bpyramid" );
if( strcmp( psz_val, "none" ) )
{
}
}
free( psz_val );
-#else
- p_sys->param.b_bframe_pyramid = var_GetBool( p_enc, SOUT_CFG_PREFIX "bpyramid" );
- #endif
i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "ref" );
if( i_val > 0 && i_val <= 15 && i_val != 3 )
p_sys->param.i_nal_hrd = X264_NAL_HRD_VBR;
else if( !strcmp( psz_val, "cbr" ) )
p_sys->param.i_nal_hrd = X264_NAL_HRD_CBR;
+ free( psz_val );
#endif
//TODO: psz_val == NULL ?
if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "weightb" ) )
p_sys->param.analyse.b_weighted_bipred = var_GetBool( p_enc,
SOUT_CFG_PREFIX "weightb" );
-#if X264_BUILD >= 79
if( var_GetInteger( p_enc, SOUT_CFG_PREFIX "weightp" ) != 2 )
p_sys->param.analyse.i_weighted_pred = var_GetInteger( p_enc, SOUT_CFG_PREFIX "weightp" );
-#endif
+
i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "b-adapt" );
if( i_val != 1 )
p_sys->param.i_bframe_adaptive = i_val;
}
free( psz_val );
- if( var_GetBool( p_enc, SOUT_CFG_PREFIX "8x8dct" ) )
+ if( !var_GetBool( p_enc, SOUT_CFG_PREFIX "8x8dct" ) )
p_sys->param.analyse.b_transform_8x8 = var_GetBool( p_enc,
SOUT_CFG_PREFIX "8x8dct" );
{
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;
-#if X264_BUILD >= 81
p_sys->param.b_vfr_input = 0;
-#endif
}
/* Check slice-options */
p_sys->param.analyse.b_transform_8x8 = 0;
p_sys->param.b_cabac = 0;
p_sys->param.i_bframe = 0;
-#if X264_BUILD >= 79
p_sys->param.analyse.i_weighted_pred = X264_WEIGHTP_NONE;
-#endif
+ p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
}
else if (!strcasecmp( psz_val, "main" ) )
{
msg_Dbg( p_enc, "Limiting to main-profile");
p_sys->param.analyse.b_transform_8x8 = 0;
+ p_sys->param.i_bframe_pyramid = X264_B_PYRAMID_NONE;
}
/* high profile don't restrict stuff*/
}
x264_picture_t pic;
x264_nal_t *nal;
block_t *p_block;
- int i_nal, i_out, i;
+ int i_nal=0, i_out=0, i=0;
/* 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++ )
- {
- pic.img.plane[i] = p_pict->p[i].p_pixels;
- pic.img.i_stride[i] = p_pict->p[i].i_pitch;
- }
+ if( likely(p_pict) ) {
+ 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++ )
+ {
+ pic.img.plane[i] = p_pict->p[i].p_pixels;
+ pic.img.i_stride[i] = p_pict->p[i].i_pitch;
+ }
- x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic, &pic );
+ x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic, &pic );
+ } else {
+ if( x264_encoder_delayed_frames( p_sys->h ) ) {
+ x264_encoder_encode( p_sys->h, &nal, &i_nal, NULL, &pic );
+ }
+ }
if( !i_nal ) return NULL;
i_out += nal[i].i_payload;
}
-#if X264_BUILD >= 83
if( pic.b_keyframe )
p_block->i_flags |= BLOCK_FLAG_TYPE_I;
-#else
- /* We only set IDR-frames as type_i as packetizer
- * places sps/pps on keyframes and we don't want it
- * to place sps/pps stuff with normal I-frames.
- * FIXME: This is a workaround and should be fixed when
- * there is some nice way to tell packetizer what is
- * keyframe.
- */
- if( pic.i_type == X264_TYPE_IDR )
- p_block->i_flags |= BLOCK_FLAG_TYPE_I;
-#endif
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 )
p_enc->fmt_in.video.i_frame_rate_base /
p_enc->fmt_in.video.i_frame_rate;
-#if X264_BUILD >= 83
/* libx264 gives pts/dts values from >= 83 onward,
* also pts starts from 0 so dts can be negative,
* but vlc doesn't handle if dts is < VLC_TS_0 so we
}
p_block->i_pts = pic.i_pts + p_sys->i_initial_delay;
p_block->i_dts = pic.i_dts + p_sys->i_initial_delay;
-#else
-
- p_block->i_pts = pic.i_pts;
-
- if( p_sys->param.i_bframe > 0 )
- {
- if( p_block->i_flags & BLOCK_FLAG_TYPE_B )
- {
- /* FIXME : this is wrong if bpyramid is set */
- p_block->i_dts = p_block->i_pts;
- p_sys->i_interpolated_dts = p_block->i_dts;
- }
- else
- {
-#if 1 /* XXX: remove me when 0 is a valid timestamp (see #3135) */
- if( p_sys->i_interpolated_dts )
- {
- p_block->i_dts = p_sys->i_interpolated_dts;
- }
- else
- {
- /* Let's put something sensible */
- p_block->i_dts = p_block->i_pts;
- }
-#else
- p_block->i_dts = p_sys->i_interpolated_dts;
-#endif
- p_sys->i_interpolated_dts += p_block->i_length;
- }
- }
- else
- {
- p_block->i_dts = p_block->i_pts;
- }
-#endif
return p_block;
}