Commit f59fff2d authored by Ilkka Ollakka's avatar Ilkka Ollakka

Use even padding in canvas

parent 90f04152
...@@ -91,7 +91,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -91,7 +91,7 @@ static int Activate( vlc_object_t *p_this )
unsigned int i_width, i_height; unsigned int i_width, i_height;
es_format_t fmt; es_format_t fmt;
char psz_croppadd[100]; char psz_croppadd[100];
int i_padd; int i_padd,i_offset;
char *psz_aspect, *psz_parser; char *psz_aspect, *psz_parser;
int i_aspect; int i_aspect;
...@@ -170,18 +170,20 @@ static int Activate( vlc_object_t *p_this ) ...@@ -170,18 +170,20 @@ static int Activate( vlc_object_t *p_this )
fmt.video.i_width = ( p_filter->fmt_in.video.i_width * i_height ) fmt.video.i_width = ( p_filter->fmt_in.video.i_width * i_height )
/ p_filter->fmt_in.video.i_height; / p_filter->fmt_in.video.i_height;
if( fmt.video.i_width & 1 ) fmt.video.i_width -= 1; if( fmt.video.i_width & 1 ) fmt.video.i_width -= 1;
i_padd = i_width - fmt.video.i_width; i_padd = (i_width - fmt.video.i_width) / 2;
i_offset = (i_padd & 1);
/* Gruik */ /* Gruik */
snprintf( psz_croppadd, 100, "croppadd{paddleft=%d,paddright=%d}", snprintf( psz_croppadd, 100, "croppadd{paddleft=%d,paddright=%d}",
i_padd/2, (i_padd+1)/2 ); i_padd - i_offset, i_padd + i_offset );
} }
else else
{ {
if( fmt.video.i_height & 1 ) fmt.video.i_height -= 1; if( fmt.video.i_height & 1 ) fmt.video.i_height -= 1;
i_padd = i_height - fmt.video.i_height; i_padd = (i_height - fmt.video.i_height ) / 2;
i_offset = (i_padd & 1);
/* Gruik */ /* Gruik */
snprintf( psz_croppadd, 100, "croppadd{paddtop=%d,paddbottom=%d}", snprintf( psz_croppadd, 100, "croppadd{paddtop=%d,paddbottom=%d}",
i_padd/2, (i_padd+1)/2 ); i_padd - i_offset, i_padd + i_offset );
} }
fmt.video.i_visible_width = fmt.video.i_width; fmt.video.i_visible_width = fmt.video.i_width;
......
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