X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fvoutqt.m;h=92d36e6cb0a2afff34a2641d22d30acf62196342;hb=eaeeb9bcc2188c1733a02cd73547eb8f58332472;hp=a2bb70679ee37866d041e83868433471f82d73a3;hpb=f3ccaec1c592a77f34044b0f36cdc47343e9563d;p=vlc diff --git a/modules/gui/macosx/voutqt.m b/modules/gui/macosx/voutqt.m index a2bb70679e..92d36e6cb0 100644 --- a/modules/gui/macosx/voutqt.m +++ b/modules/gui/macosx/voutqt.m @@ -9,6 +9,7 @@ * Jon Lech Johansen * Derk-Jan Hartman * Eric Petit + * Benjamin Pracht * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -61,7 +62,7 @@ struct vout_sys_t VLCVoutView * o_vout_view; vlc_bool_t b_saved_frame; - vlc_bool_t b_altivec; + vlc_bool_t b_cpu_has_simd; /* does CPU supports Altivec, MMX, etc... */ NSRect s_frame; CodecType i_codec; @@ -71,17 +72,19 @@ struct vout_sys_t DecompressorComponent img_dc; ImageDescriptionHandle h_img_descr; + /* video geometry in port */ + int i_origx, i_origy; + int i_width, i_height; /* Mozilla plugin-related variables */ vlc_bool_t b_embedded; - Rect clipping_rect; - int portx, porty; + RgnHandle clip_mask; }; struct picture_sys_t { void *p_data; unsigned int i_size; - + /* When using I420 output */ PlanarPixmapInfoYUV420 pixmap_i420; }; @@ -97,6 +100,9 @@ static void DisplayVideo ( vout_thread_t *, picture_t * ); static int ControlVideo ( vout_thread_t *, int, va_list ); static int CoToggleFullscreen( vout_thread_t *p_vout ); +static int DrawableRedraw( vlc_object_t *p_this, const char *psz_name, + vlc_value_t oval, vlc_value_t nval, void *param); +static void UpdateEmbeddedGeometry( vout_thread_t *p_vout ); static void QTScaleMatrix ( vout_thread_t * ); static int QTCreateSequence ( vout_thread_t * ); static void QTDestroySequence ( vout_thread_t * ); @@ -140,8 +146,9 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) else p_vout->p_sys->b_embedded = VLC_FALSE; - p_vout->p_sys->b_altivec = p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC; - msg_Dbg( p_vout, "We do%s have Altivec", p_vout->p_sys->b_altivec ? "" : "n't" ); + p_vout->p_sys->b_cpu_has_simd = (p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC) + | (p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT); + msg_Dbg( p_vout, "we do%s have SIMD enabled CPU", p_vout->p_sys->b_cpu_has_simd ? "" : "n't" ); /* Initialize QuickTime */ p_vout->p_sys->h_img_descr = @@ -151,7 +158,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) if( ( err = EnterMovies() ) != noErr ) { - msg_Err( p_vout, "EnterMovies failed: %d", err ); + msg_Err( p_vout, "QT initialization failed: EnterMovies failed: %d", err ); free( p_vout->p_sys->p_matrix ); DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); free( p_vout->p_sys ); @@ -162,7 +169,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock ); /* Can we find the right chroma ? */ - if( p_vout->p_sys->b_altivec ) + if( p_vout->p_sys->b_cpu_has_simd ) { err = FindCodec( kYUVSPixelFormat, bestSpeedCodec, nil, &p_vout->p_sys->img_dc ); @@ -176,7 +183,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) if( err == noErr && p_vout->p_sys->img_dc != 0 ) { - if( p_vout->p_sys->b_altivec ) + if( p_vout->p_sys->b_cpu_has_simd ) { p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2'); p_vout->p_sys->i_codec = kYUVSPixelFormat; @@ -189,7 +196,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) } else { - msg_Err( p_vout, "failed to find an appropriate codec" ); + msg_Err( p_vout, "QT doesn't support any appropriate chroma" ); } if( p_vout->p_sys->img_dc == 0 ) @@ -200,39 +207,19 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) return VLC_EGENERIC; } -#define o_qtview p_vout->p_sys->o_qtview - o_qtview = [[VLCQTView alloc] initWithVout: p_vout]; - [o_qtview autorelease]; - - if( p_vout->p_sys->b_embedded ) - { - /* Zero the clipping rectangle */ - p_vout->p_sys->clipping_rect.left = 0; - p_vout->p_sys->clipping_rect.right = 0; - p_vout->p_sys->clipping_rect.top = 0; - p_vout->p_sys->clipping_rect.bottom = 0; - } - else + if( p_vout->b_fullscreen || !p_vout->p_sys->b_embedded ) { /* Spawn window */ +#define o_qtview p_vout->p_sys->o_qtview + o_qtview = [[VLCQTView alloc] initWithVout: p_vout]; + [o_qtview autorelease]; + p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout subView: o_qtview frame: nil]; if( !p_vout->p_sys->o_vout_view ) { return VLC_EGENERIC; } - } - - /* Retrieve the QuickDraw port */ - if( p_vout->p_sys->b_embedded ) - { - /* Don't need (nor want) to lock the focus, since otherwise we crash - * (presumably because we don't own the window, but I'm not sure - * if this is the exact reason) -andrep */ - p_vout->p_sys->p_qdport = [o_qtview qdPort]; - } - else - { [o_qtview lockFocus]; p_vout->p_sys->p_qdport = [o_qtview qdPort]; [o_qtview unlockFocus]; @@ -250,7 +237,7 @@ void E_(CloseVideoQT) ( vlc_object_t *p_this ) NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; vout_thread_t * p_vout = (vout_thread_t *)p_this; - if( !p_vout->p_sys->b_embedded ) + if( p_vout->b_fullscreen || !p_vout->p_sys->b_embedded ) [p_vout->p_sys->o_vout_view closeVout]; /* Clean Up Quicktime environment */ @@ -279,22 +266,32 @@ static int InitVideo ( vout_thread_t *p_vout ) p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; - /* If we are embedded (e.g. running as a Mozilla plugin), use the pointer - * stored in the "drawable" value as the CGrafPtr for the QuickDraw - * graphics port */ - if( p_vout->p_sys->b_embedded ) + if( p_vout->b_fullscreen || !p_vout->p_sys->b_embedded ) { - vlc_value_t val; - var_Get( p_vout->p_vlc, "drawable", &val ); - p_vout->p_sys->p_qdport = (CGrafPtr) val.i_int; + Rect s_rect; + p_vout->p_sys->clip_mask = NULL; + GetPortBounds( p_vout->p_sys->p_qdport, &s_rect ); + p_vout->p_sys->i_origx = s_rect.left; + p_vout->p_sys->i_origy = s_rect.top; + p_vout->p_sys->i_width = s_rect.right - s_rect.left; + p_vout->p_sys->i_height = s_rect.bottom - s_rect.top; + } + else + { + /* As we are embedded (e.g. running as a Mozilla plugin), use the pointer + * stored in the "drawable" value as the CGrafPtr for the QuickDraw + * graphics port */ + /* Create the clipping mask */ + p_vout->p_sys->clip_mask = NewRgn(); + UpdateEmbeddedGeometry(p_vout); + var_AddCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout); } - SetPort( p_vout->p_sys->p_qdport ); QTScaleMatrix( p_vout ); if( QTCreateSequence( p_vout ) ) { - msg_Err( p_vout, "unable to create sequence" ); + msg_Err( p_vout, "unable to initialize QT: QTCreateSequence failed" ); return( 1 ); } @@ -337,6 +334,12 @@ static void EndVideo( vout_thread_t *p_vout ) QTDestroySequence( p_vout ); + if( !p_vout->b_fullscreen && p_vout->p_sys->b_embedded ) + { + var_DelCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout); + DisposeRgn(p_vout->p_sys->clip_mask); + } + /* Free the direct buffers we allocated */ for( i_index = I_OUTPUTPICTURES; i_index; ) { @@ -353,9 +356,6 @@ static void EndVideo( vout_thread_t *p_vout ) *****************************************************************************/ static int ManageVideo( vout_thread_t *p_vout ) { - vlc_value_t val; - var_Get( p_vout->p_vlc, "drawableredraw", &val ); - if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) { if( CoToggleFullscreen( p_vout ) ) @@ -366,26 +366,44 @@ static int ManageVideo( vout_thread_t *p_vout ) p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; } - if( p_vout->p_sys->b_embedded && val.i_int == 1 ) - { - /* If we're embedded, the application is expected to indicate a - * window change (move/resize/etc) via the "drawableredraw" value. - * If that's the case, set the VOUT_SIZE_CHANGE flag so we do - * actually handle the window change. */ - val.i_int = 0; - var_Set( p_vout->p_vlc, "drawableredraw", val ); - - p_vout->i_changes |= VOUT_SIZE_CHANGE; - } - if( p_vout->i_changes & VOUT_SIZE_CHANGE ) + { + if( p_vout->b_fullscreen || !p_vout->p_sys->b_embedded ) + { + /* get the geometry from NSQuickDrawView */ + Rect s_rect; + GetPortBounds( p_vout->p_sys->p_qdport, &s_rect ); + p_vout->p_sys->i_origx = s_rect.left; + p_vout->p_sys->i_origy = s_rect.top; + p_vout->p_sys->i_width = s_rect.right - s_rect.left; + p_vout->p_sys->i_height = s_rect.bottom - s_rect.top; + } + else + { + /* As we're embedded, get the geometry from Mozilla/Safari NPWindow object */ + UpdateEmbeddedGeometry( p_vout ); + SetDSequenceMask(p_vout->p_sys->i_seq, + p_vout->p_sys->clip_mask); + } + } + + if( p_vout->i_changes & VOUT_SIZE_CHANGE || + p_vout->i_changes & VOUT_ASPECT_CHANGE ) { QTScaleMatrix( p_vout ); SetDSequenceMatrix( p_vout->p_sys->i_seq, p_vout->p_sys->p_matrix ); + } + if( p_vout->i_changes & VOUT_SIZE_CHANGE ) + { p_vout->i_changes &= ~VOUT_SIZE_CHANGE; } + if( p_vout->i_changes & VOUT_ASPECT_CHANGE ) + { + p_vout->i_changes &= ~VOUT_ASPECT_CHANGE; + } + // can be nil [p_vout->p_sys->o_vout_view manage]; return( 0 ); @@ -400,55 +418,34 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) { OSErr err; CodecFlags flags; - - Rect saved_rect; - RgnHandle saved_clip; - - saved_clip = NewRgn(); - - if( p_vout->p_sys->b_embedded ) - { - /* In the Mozilla plugin, the browser also draws things in the windows. - * So, we have to update the origin and clipping rectangle for each - * picture. FIXME: The vout should probably lock something ... */ - - /* Save the origin and clipping rectangle used by the host application - * (e.g. Mozilla), so we can restore it later */ - GetPortBounds( p_vout->p_sys->p_qdport, &saved_rect ); - GetClip( saved_clip ); - - /* The port gets unlocked at the end of this function */ - LockPortBits( p_vout->p_sys->p_qdport ); - - /* Change the origin and clipping to the coordinates that the embedded - * window wants to draw at */ - SetPort( p_vout->p_sys->p_qdport ); - SetOrigin( p_vout->p_sys->portx , p_vout->p_sys->porty ); - ClipRect( &p_vout->p_sys->clipping_rect ); - } - - if( ( err = DecompressSequenceFrameWhen( - p_vout->p_sys->i_seq, - p_pic->p_sys->p_data, - p_pic->p_sys->i_size, - codecFlagUseImageBuffer, &flags, NULL, NULL ) != noErr ) ) - { - msg_Warn( p_vout, "DecompressSequenceFrameWhen failed: %d", err ); - } - else - { - if( !p_vout->p_sys->b_embedded ) - QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil ); - } - - if( p_vout->p_sys->b_embedded ) - { - /* Restore the origin and clipping rectangle to the settings used - * by the host application */ - SetOrigin( saved_rect.left, saved_rect.top ); - SetClip( saved_clip ); - - UnlockPortBits( p_vout->p_sys->p_qdport ); + if( (NULL == p_vout->p_sys->clip_mask) || !EmptyRgn(p_vout->p_sys->clip_mask) ) + { + //CGrafPtr oldPort; + //Rect oldBounds; + + /* since there is not way to lock a QuickDraw port for exclusive use + there is a potential problem that the frame will be displayed + in the wrong place if other embedded plugins redraws as the port + origin may be changed */ + //GetPort(&oldPort); + //GetPortBounds(p_vout->p_sys->p_qdport, &oldBounds); + SetPort(p_vout->p_sys->p_qdport); + SetOrigin(p_vout->p_sys->i_origx, p_vout->p_sys->i_origy); + if( ( err = DecompressSequenceFrameWhen( + p_vout->p_sys->i_seq, + p_pic->p_sys->p_data, + p_pic->p_sys->i_size, + codecFlagUseImageBuffer, &flags, NULL, NULL ) == noErr ) ) + { + QDFlushPortBuffer( p_vout->p_sys->p_qdport, p_vout->p_sys->clip_mask ); + //QDFlushPortBuffer( p_vout->p_sys->p_qdport, NULL ); + } + else + { + msg_Warn( p_vout, "QT failed to display the frame sequence: %d", err ); + } + //SetPortBounds(p_vout->p_sys->p_qdport, &oldBounds); + //SetPort(oldPort); } } @@ -486,101 +483,153 @@ static int CoToggleFullscreen( vout_thread_t *p_vout ) if( !p_vout->b_fullscreen ) { - /* Save window size and position */ - p_vout->p_sys->s_frame.size = - [p_vout->p_sys->o_vout_view frame].size; - p_vout->p_sys->s_frame.origin = - [[p_vout->p_sys->o_vout_view getWindow] frame].origin; - p_vout->p_sys->b_saved_frame = VLC_TRUE; + if( !p_vout->p_sys->b_embedded ) + { + /* Save window size and position */ + p_vout->p_sys->s_frame.size = + [p_vout->p_sys->o_vout_view frame].size; + p_vout->p_sys->s_frame.origin = + [[p_vout->p_sys->o_vout_view getWindow] frame].origin; + p_vout->p_sys->b_saved_frame = VLC_TRUE; + } + else + { + var_DelCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout); + DisposeRgn(p_vout->p_sys->clip_mask); + } } [p_vout->p_sys->o_vout_view closeVout]; p_vout->b_fullscreen = !p_vout->b_fullscreen; -#define o_qtview p_vout->p_sys->o_qtview - o_qtview = [[VLCQTView alloc] initWithVout: p_vout]; - [o_qtview autorelease]; - - if( p_vout->p_sys->b_saved_frame ) + if( p_vout->b_fullscreen || !p_vout->p_sys->b_embedded ) { - p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout - subView: o_qtview - frame: &p_vout->p_sys->s_frame]; + Rect s_rect; + p_vout->p_sys->clip_mask = NULL; +#define o_qtview p_vout->p_sys->o_qtview + o_qtview = [[VLCQTView alloc] initWithVout: p_vout]; + [o_qtview autorelease]; + + if( p_vout->p_sys->b_saved_frame ) + { + p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout + subView: o_qtview + frame: &p_vout->p_sys->s_frame]; + } + else + { + p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout + subView: o_qtview frame: nil]; + } + + /* Retrieve the QuickDraw port */ + [o_qtview lockFocus]; + p_vout->p_sys->p_qdport = [o_qtview qdPort]; + [o_qtview unlockFocus]; +#undef o_qtview + GetPortBounds( p_vout->p_sys->p_qdport, &s_rect ); + p_vout->p_sys->i_origx = s_rect.left; + p_vout->p_sys->i_origy = s_rect.top; + p_vout->p_sys->i_width = s_rect.right - s_rect.left; + p_vout->p_sys->i_height = s_rect.bottom - s_rect.top; } else { - p_vout->p_sys->o_vout_view = [VLCVoutView getVoutView: p_vout - subView: o_qtview frame: nil]; + /* Create the clipping mask */ + p_vout->p_sys->clip_mask = NewRgn(); + UpdateEmbeddedGeometry(p_vout); + var_AddCallback(p_vout->p_vlc, "drawableredraw", DrawableRedraw, p_vout); } - - /* Retrieve the QuickDraw port */ - [o_qtview lockFocus]; - p_vout->p_sys->p_qdport = [o_qtview qdPort]; - [o_qtview unlockFocus]; -#undef o_qtview - - SetPort( p_vout->p_sys->p_qdport ); QTScaleMatrix( p_vout ); if( QTCreateSequence( p_vout ) ) { - msg_Err( p_vout, "unable to create sequence" ); - return( 1 ); - } + msg_Err( p_vout, "unable to initialize QT: QTCreateSequence failed" ); + return( 1 ); + } [o_pool release]; return 0; } +/* If we're embedded, the application is expected to indicate a + * window change (move/resize/etc) via the "drawableredraw" value. + * If that's the case, set the VOUT_SIZE_CHANGE flag so we do + * actually handle the window change. */ + +static int DrawableRedraw( vlc_object_t *p_this, const char *psz_name, + vlc_value_t oval, vlc_value_t nval, void *param) +{ + /* ignore changes until we are ready for them */ + if( (oval.i_int != nval.i_int) && (nval.i_int == 1) ) + { + vout_thread_t *p_vout = (vout_thread_t *)param; + /* prevent QT from rendering any more video until we have updated + the geometry */ + SetEmptyRgn(p_vout->p_sys->clip_mask); + SetDSequenceMask(p_vout->p_sys->i_seq, + p_vout->p_sys->clip_mask); + + p_vout->i_changes |= VOUT_SIZE_CHANGE; + } + return VLC_SUCCESS; +} + +/* Embedded video get their drawing region from the host application + * by the drawable values here. Read those variables, and store them + * in the p_vout->p_sys structure so that other functions (such as + * DisplayVideo and ManageVideo) can use them later. */ + +static void UpdateEmbeddedGeometry( vout_thread_t *p_vout ) +{ + vlc_value_t val; + vlc_value_t valt, vall, valb, valr, valx, valy, valw, valh, + valportx, valporty; + + var_Get( p_vout->p_vlc, "drawable", &val ); + var_Get( p_vout->p_vlc, "drawablet", &valt ); + var_Get( p_vout->p_vlc, "drawablel", &vall ); + var_Get( p_vout->p_vlc, "drawableb", &valb ); + var_Get( p_vout->p_vlc, "drawabler", &valr ); + var_Get( p_vout->p_vlc, "drawablex", &valx ); + var_Get( p_vout->p_vlc, "drawabley", &valy ); + var_Get( p_vout->p_vlc, "drawablew", &valw ); + var_Get( p_vout->p_vlc, "drawableh", &valh ); + var_Get( p_vout->p_vlc, "drawableportx", &valportx ); + var_Get( p_vout->p_vlc, "drawableporty", &valporty ); + + /* portx, porty contains values for SetOrigin() function + which isn't used, instead use QT Translate matrix */ + p_vout->p_sys->i_origx = valportx.i_int; + p_vout->p_sys->i_origy = valporty.i_int; + p_vout->p_sys->p_qdport = (CGrafPtr) val.i_int; + p_vout->p_sys->i_width = valw.i_int; + p_vout->p_sys->i_height = valh.i_int; + + /* update video clipping mask */ + /*SetRectRgn( p_vout->p_sys->clip_mask , vall.i_int , + valt.i_int, valr.i_int, valb.i_int );*/ + SetRectRgn( p_vout->p_sys->clip_mask , vall.i_int + valportx.i_int , + valt.i_int + valporty.i_int , valr.i_int + valportx.i_int , + valb.i_int + valporty.i_int ); + + /* reset drawableredraw variable indicating we are ready + to take changes in video geometry */ + val.i_int=0; + var_Set( p_vout->p_vlc, "drawableredraw", val ); +} + /***************************************************************************** * QTScaleMatrix: scale matrix *****************************************************************************/ static void QTScaleMatrix( vout_thread_t *p_vout ) { - Rect s_rect; vlc_value_t val; - unsigned int i_width, i_height; Fixed factor_x, factor_y; unsigned int i_offset_x = 0; unsigned int i_offset_y = 0; - - GetPortBounds( p_vout->p_sys->p_qdport, &s_rect ); - - i_width = s_rect.right - s_rect.left; - i_height = s_rect.bottom - s_rect.top; - - if( p_vout->p_sys->b_embedded ) - { - /* Embedded video get their drawing region from the host application - * by the drawable values here. Read those variables, and store them - * in the p_vout->p_sys structure so that other functions (such as - * DisplayVideo and ManageVideo) can use them later. */ - vlc_value_t valt, vall, valb, valr, valx, valy, valw, valh, - valportx, valporty; - - var_Get( p_vout->p_vlc, "drawable", &val ); - var_Get( p_vout->p_vlc, "drawablet", &valt ); - var_Get( p_vout->p_vlc, "drawablel", &vall ); - var_Get( p_vout->p_vlc, "drawableb", &valb ); - var_Get( p_vout->p_vlc, "drawabler", &valr ); - var_Get( p_vout->p_vlc, "drawablex", &valx ); - var_Get( p_vout->p_vlc, "drawabley", &valy ); - var_Get( p_vout->p_vlc, "drawablew", &valw ); - var_Get( p_vout->p_vlc, "drawableh", &valh ); - var_Get( p_vout->p_vlc, "drawableportx", &valportx ); - var_Get( p_vout->p_vlc, "drawableporty", &valporty ); - - p_vout->p_sys->portx = valportx.i_int; - p_vout->p_sys->porty = valporty.i_int; - p_vout->p_sys->p_qdport = (CGrafPtr) val.i_int; - i_width = valw.i_int; - i_height = valh.i_int; - - p_vout->p_sys->clipping_rect.top = 0; - p_vout->p_sys->clipping_rect.left = 0; - p_vout->p_sys->clipping_rect.bottom = valb.i_int - valt.i_int; - p_vout->p_sys->clipping_rect.right = valr.i_int - vall.i_int; - } + int i_width = p_vout->p_sys->i_width; + int i_height = p_vout->p_sys->i_height; var_Get( p_vout, "macosx-stretch", &val ); if( val.b_bool ) @@ -591,27 +640,34 @@ static void QTScaleMatrix( vout_thread_t *p_vout ) Long2Fix( p_vout->output.i_height ) ); } - else if( i_height * p_vout->output.i_aspect < i_width * VOUT_ASPECT_FACTOR ) + else if( i_height * p_vout->fmt_in.i_visible_width * + p_vout->fmt_in.i_sar_num < + i_width * p_vout->fmt_in.i_visible_height * + p_vout->fmt_in.i_sar_den ) { - int i_adj_width = i_height * p_vout->output.i_aspect / - VOUT_ASPECT_FACTOR; + int i_adj_width = i_height * p_vout->fmt_in.i_visible_width * + p_vout->fmt_in.i_sar_num / + ( p_vout->fmt_in.i_sar_den * + p_vout->fmt_in.i_visible_height ); factor_x = FixDiv( Long2Fix( i_adj_width ), - Long2Fix( p_vout->output.i_width ) ); + Long2Fix( p_vout->fmt_in.i_visible_width ) ); factor_y = FixDiv( Long2Fix( i_height ), - Long2Fix( p_vout->output.i_height ) ); + Long2Fix( p_vout->fmt_in.i_visible_height ) ); i_offset_x = (i_width - i_adj_width) / 2; } else { - int i_adj_height = i_width * VOUT_ASPECT_FACTOR / - p_vout->output.i_aspect; + int i_adj_height = i_width * p_vout->fmt_in.i_visible_height * + p_vout->fmt_in.i_sar_den / + ( p_vout->fmt_in.i_sar_num * + p_vout->fmt_in.i_visible_width ); factor_x = FixDiv( Long2Fix( i_width ), - Long2Fix( p_vout->output.i_width ) ); + Long2Fix( p_vout->fmt_in.i_visible_width ) ); factor_y = FixDiv( Long2Fix( i_adj_height ), - Long2Fix( p_vout->output.i_height ) ); + Long2Fix( p_vout->fmt_in.i_visible_height ) ); i_offset_y = (i_height - i_adj_height) / 2; } @@ -664,12 +720,12 @@ static int QTCreateSequence( vout_thread_t *p_vout ) p_vout->p_sys->p_qdport, NULL, NULL, p_vout->p_sys->p_matrix, - srcCopy, NULL, + srcCopy, p_vout->p_sys->clip_mask, codecFlagUseImageBuffer, codecLosslessQuality, bestSpeedCodec ) ) ) { - msg_Err( p_vout, "DecompressSequenceBeginS failed: %d", err ); + msg_Err( p_vout, "Failed to initialize QT: DecompressSequenceBeginS failed: %d", err ); return( 1 ); } @@ -777,7 +833,7 @@ static int QTNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) default: /* Unknown chroma, tell the guy to get lost */ free( p_pic->p_sys ); - msg_Err( p_vout, "never heard of chroma 0x%.8x (%4.4s)", + msg_Err( p_vout, "Unknown chroma format 0x%.8x (%4.4s)", p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma ); p_pic->i_planes = 0; return( -1 );