Skip to content

V
vlc-1.1
Commit 89e1637e authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Round scaled sizes to 16 (Closes:#524)

parent 54f1118b
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 1 deletion
modules/stream_out/transcode.c
View file @ 89e1637e
...@@ -1547,9 +1547,24 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream, ...@@ -1547,9 +1547,24 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream,
if( id->p_encoder->fmt_out.video.i_width <= 0 && if( id->p_encoder->fmt_out.video.i_width <= 0 &&
id->p_encoder->fmt_out.video.i_height <= 0 && p_sys->f_scale ) id->p_encoder->fmt_out.video.i_height <= 0 && p_sys->f_scale )
{ {
/* Apply the scaling */ /* Apply the scaling and round at the nearest 16. Don't allow 0 size */
id->p_encoder->fmt_out.video.i_width = i_width * p_sys->f_scale; id->p_encoder->fmt_out.video.i_width = i_width * p_sys->f_scale;
if( id->p_encoder->fmt_out.video.i_width % 16 <= 7 &&
id->p_encoder->fmt_out.video.i_width >= 16 )
id->p_encoder->fmt_out.video.i_width -=
id->p_encoder->fmt_out.video.i_width % 16;
else
id->p_encoder->fmt_out.video.i_width +=
16 - id->p_encoder->fmt_out.video.i_width % 16;
id->p_encoder->fmt_out.video.i_height = i_height * p_sys->f_scale; id->p_encoder->fmt_out.video.i_height = i_height * p_sys->f_scale;
if( id->p_encoder->fmt_out.video.i_height % 16 <= 7 &&
id->p_encoder->fmt_out.video.i_height >= 16 )
id->p_encoder->fmt_out.video.i_height -=
id->p_encoder->fmt_out.video.i_height % 16;
else
id->p_encoder->fmt_out.video.i_height +=
16 - id->p_encoder->fmt_out.video.i_height % 16;
} }
else if( id->p_encoder->fmt_out.video.i_width > 0 && else if( id->p_encoder->fmt_out.video.i_width > 0 &&
id->p_encoder->fmt_out.video.i_height <= 0 ) id->p_encoder->fmt_out.video.i_height <= 0 )
......
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