"If scenecuts appear within this interval, they are still encoded as " \
"I-frames, but do not start a new GOP." )
+#define OPENGOP_TEXT N_("Use recovery points to close GOPs")
+#define OPENGOP_LONGTEXT N_("none: use closed GOPs only\n"\
+ "normal: use standard open GOPs\n" \
+ "bluray: use Blu-ray compatible open GOPs" )
+
#define SCENE_TEXT N_("Extra I-frames aggressivity" )
#define SCENE_LONGTEXT N_( "Scene-cut detection. Controls how " \
"aggressively to insert extra I-frames. With small values of " \
add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT,
MIN_KEYINT_LONGTEXT, false )
+#if X264_BUILD >= 102
+ add_string( SOUT_CFG_PREFIX "opengop", "none", NULL, OPENGOP_TEXT,
+ OPENGOP_LONGTEXT,false )
+ change_string_list( x264_open_gop_names, x264_open_gop_names, 0 );
+#endif
+
add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT,
SCENE_LONGTEXT, false )
change_integer_range( -1, 100 )
"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", "opengop", NULL
};
static block_t *Encode( encoder_t *, picture_t * );
x264_t *h;
x264_param_t param;
- int i_initial_delay;
+ mtime_t i_initial_delay;
- char *psz_stat_name;
+ char *psz_stat_name;
};
#ifdef PTW32_STATIC_LIB
i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "min-keyint" );
if( i_val > 0 && i_val != 25 ) p_sys->param.i_keyint_min = i_val;
+#if X264_BUILD >= 102
+ psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "opengop" );
+ if( !strcmp( psz_val, "none" ) )
+ p_sys->param.i_open_gop = X264_OPEN_GOP_NONE;
+ else if( !strcmp( psz_val, "normal" ) )
+ p_sys->param.i_open_gop = X264_OPEN_GOP_NORMAL;
+ else if( !strcmp( psz_val, "bluray" ) )
+ p_sys->param.i_open_gop = X264_OPEN_GOP_BLURAY;
+ free( psz_val );
+#endif
i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "bframes" );
if( i_val >= 0 && i_val <= 16 && i_val != 3 )
p_sys->param.i_bframe = i_val;
* difference that well yet*/
p_sys->param.rc.i_lookahead= var_GetInteger( p_enc, SOUT_CFG_PREFIX "lookahead" );
+ /* We don't want repeated headers, we repeat p_extra ourself if needed */
+ p_sys->param.b_repeat_headers = 0;
+
/* Open the encoder */
p_sys->h = x264_encoder_open( &p_sys->param );
#endif
if( likely(p_pict) ) {
pic.i_pts = p_pict->date;
+ /* scale pts starting from 0 as libx264 seems to return dts values
+ assume that
+ */
+ if( unlikely( p_sys->i_initial_delay == 0 ) )
+ p_sys->i_initial_delay = p_pict->date;
+ pic.i_pts -= p_sys->i_initial_delay;
pic.img.i_csp = X264_CSP_I420;
pic.img.i_plane = p_pict->i_planes;
for( i = 0; i < p_pict->i_planes; i++ )
p_enc->fmt_in.video.i_frame_rate_base /
p_enc->fmt_in.video.i_frame_rate;
- /* 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
- * use that offset to get it right for vlc.
- */
- if( p_sys->i_initial_delay == 0 && pic.i_dts < VLC_TS_0 )
- {
- p_sys->i_initial_delay = -1* pic.i_dts;
- msg_Dbg( p_enc, "Initial delay is set to %d", p_sys->i_initial_delay );
- }
+ /* scale pts-values back*/
p_block->i_pts = pic.i_pts + p_sys->i_initial_delay;
p_block->i_dts = pic.i_dts + p_sys->i_initial_delay;