Commit a49a93fe authored by hartman's avatar hartman
Browse files

* fixed an issue with blackbars at certain aspect ratios when you resize

  the video window. (half, double)
parent 9940fc7b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout.m: MacOS X video output plugin * vout.m: MacOS X video output plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: vout.m,v 1.37 2003/03/06 11:43:07 hartman Exp $ * $Id: vout.m,v 1.38 2003/03/06 12:52:32 hartman Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org> * Florian G. Pflug <fgp@phlo.org>
...@@ -745,7 +745,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -745,7 +745,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
- (void)scaleWindowWithFactor: (float)factor - (void)scaleWindowWithFactor: (float)factor
{ {
NSSize newsize; NSSize newsize;
int i_corrected_height; int i_corrected_height, i_corrected_width;
NSPoint topleftbase; NSPoint topleftbase;
NSPoint topleftscreen; NSPoint topleftscreen;
...@@ -755,10 +755,22 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -755,10 +755,22 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
topleftbase.y = [self frame].size.height; topleftbase.y = [self frame].size.height;
topleftscreen = [self convertBaseToScreen: topleftbase]; topleftscreen = [self convertBaseToScreen: topleftbase];
i_corrected_height = p_vout->output.i_width * VOUT_ASPECT_FACTOR / if( p_vout->output.i_height * p_vout->output.i_aspect <
p_vout->output.i_width * VOUT_ASPECT_FACTOR )
{
i_corrected_width = p_vout->output.i_height * p_vout->output.i_aspect /
VOUT_ASPECT_FACTOR;
newsize.width = (int) ( i_corrected_width * factor );
newsize.height = (int) ( p_vout->render.i_height * factor );
}
else
{
i_corrected_height = p_vout->output.i_width * VOUT_ASPECT_FACTOR /
p_vout->output.i_aspect; p_vout->output.i_aspect;
newsize.width = (int) ( p_vout->render.i_width * factor ); newsize.width = (int) ( p_vout->render.i_width * factor );
newsize.height = (int) ( i_corrected_height * factor ); newsize.height = (int) ( i_corrected_height * factor );
}
[self setContentSize: newsize]; [self setContentSize: newsize];
[self setFrameTopLeftPoint: topleftscreen]; [self setFrameTopLeftPoint: topleftscreen];
......
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