Skip to content

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

only round width and scale height accordingly

parent 8a9fe652
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
modules/stream_out/transcode.c
View file @ 0236ff18
......@@ -1547,7 +1547,7 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream,
if( id->p_encoder->fmt_out.video.i_width <= 0 &&
id->p_encoder->fmt_out.video.i_height <= 0 && p_sys->f_scale )
{
/* Apply the scaling and round at the nearest 16. Don't allow 0 size */
float f_real_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 )
......@@ -1557,14 +1557,14 @@ static int transcode_video_encoder_open( sout_stream_t *p_stream,
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;
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;
f_real_scale = (float)( id->p_encoder->fmt_out.video.i_width) /
(float)i_width;
id->p_encoder->fmt_out.video.i_height = __MAX( 16,
i_height * f_real_scale );
msg_Dbg( p_stream, "scaling to %ix%i",
id->p_encoder->fmt_out.video.i_width,
id->p_encoder->fmt_out.video.i_height );
}
else if( id->p_encoder->fmt_out.video.i_width > 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