Skip to content

V
vlc-gpu
Commit dd2be923 authored by Mark Moriarty's avatar Mark Moriarty
Browse files
Options

transcode -- round fps to full integer value (eg, 25, 30) for ffmpeg mpeg1/2

parent b6e9913f
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 2 deletions
modules/stream_out/transcode.c
View file @ dd2be923
...@@ -672,10 +672,22 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -672,10 +672,22 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
if( p_sys->f_fps > 0 ) if( p_sys->f_fps > 0 )
{ {
id->p_encoder->fmt_out.video.i_frame_rate = nearbyint(p_sys->f_fps * 1000) ; if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', 'g', 'v' ) ||
id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', '1', 'v' ) ||
id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', '2', 'v' ) )
{ /* ffmpeg mpeg1/2 wants integer, 30 not 29.97, for example */
p_sys->f_fps = nearbyint(p_sys->f_fps);
id->p_encoder->fmt_out.video.i_frame_rate = p_sys->f_fps;
id->p_encoder->fmt_out.video.i_frame_rate_base = 1;
}
else
{ /* scale by 1000 so you can get non-integer rates, like 29.97 */
id->p_encoder->fmt_out.video.i_frame_rate =
nearbyint(p_sys->f_fps * 1000) ;
id->p_encoder->fmt_out.video.i_frame_rate_base = 1000; id->p_encoder->fmt_out.video.i_frame_rate_base = 1000;
} }
} }
}
else if( p_fmt->i_cat == SPU_ES && (p_sys->i_scodec || p_sys->psz_senc) ) else if( p_fmt->i_cat == SPU_ES && (p_sys->i_scodec || p_sys->psz_senc) )
{ {
msg_Dbg( p_stream, "creating subtitles transcoding from fcc=`%4.4s' " msg_Dbg( p_stream, "creating subtitles transcoding from fcc=`%4.4s' "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment