-
/*****************************************************************************
- * vout.m: MacOS X video output plugin
+ * vout.m: MacOS X video output module
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: vout.m,v 1.62 2003/11/05 00:40:08 hartman Exp $
+ * $Id: vout.m,v 1.77 2004/02/03 13:00:27 titer Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Eric Petit <titer@m0k.org>
*
* 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
#include <QuickTime/QuickTime.h>
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
+
#include <vlc_keys.h>
#include "intf.h"
vout_thread_t * p_vout = (vout_thread_t *)p_this;
OSErr err;
int i_timeout;
- vlc_value_t value_drawable;
-
- var_Get( p_vout->p_vlc, "drawable", &value_drawable );
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
- /* We don't need an intf in mozilla plugin */
- if( value_drawable.i_int == 0 )
+ /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
+ for( i_timeout = 20 ; i_timeout-- ; )
{
- /* Wait for a MacOS X interface to appear. Timeout is 2 seconds. */
- for( i_timeout = 20 ; i_timeout-- ; )
+ if( NSApp == NULL )
{
- if( NSApp == NULL )
+ msleep( INTF_IDLE_SLEEP );
+ }
+ }
+
+ if( NSApp == NULL )
+ {
+ /* no MacOS X intf, unable to communicate with MT */
+ msg_Err( p_vout, "no MacOS X interface present" );
+ free( p_vout->p_sys );
+ return( 1 );
+ }
+
+ if( [NSApp respondsToSelector: @selector(getIntf)] )
+ {
+ intf_thread_t * p_intf;
+
+ for( i_timeout = 10 ; i_timeout-- ; )
+ {
+ if( ( p_intf = [NSApp getIntf] ) == NULL )
{
msleep( INTF_IDLE_SLEEP );
}
}
-
- if( NSApp == NULL )
+
+ if( p_intf == NULL )
{
- /* no MacOS X intf, unable to communicate with MT */
- msg_Err( p_vout, "no MacOS X interface present" );
+ msg_Err( p_vout, "MacOS X intf has getIntf, but is NULL" );
free( p_vout->p_sys );
return( 1 );
}
-
-
- if( [NSApp respondsToSelector: @selector(getIntf)] )
- {
- intf_thread_t * p_intf;
-
- for( i_timeout = 10 ; i_timeout-- ; )
- {
- if( ( p_intf = [NSApp getIntf] ) == NULL )
- {
- msleep( INTF_IDLE_SLEEP );
- }
- }
-
- if( p_intf == NULL )
- {
- msg_Err( p_vout, "MacOS X intf has getIntf, but is NULL" );
- free( p_vout->p_sys );
- return( 1 );
- }
- }
}
- p_vout->p_sys->h_img_descr =
- (ImageDescriptionHandle)NewHandleClear( sizeof(ImageDescription) );
- p_vout->p_sys->p_matrix = (MatrixRecordPtr)malloc( sizeof(MatrixRecord) );
- p_vout->p_sys->p_fullscreen_state = NULL;
-
- p_vout->p_sys->b_mouse_pointer_visible = VLC_TRUE;
p_vout->p_sys->b_mouse_moved = VLC_TRUE;
p_vout->p_sys->i_time_mouse_last_moved = mdate();
- if( value_drawable.i_int != 0 )
- {
- p_vout->p_sys->mask = NewRgn();
- p_vout->p_sys->rect.left = 0 ;
- p_vout->p_sys->rect.right = 0 ;
- p_vout->p_sys->rect.top = 0 ;
- p_vout->p_sys->rect.bottom = 0 ;
-
- p_vout->p_sys->isplugin = VLC_TRUE ;
-
- } else
- {
- p_vout->p_sys->mask = NULL;
- p_vout->p_sys->isplugin = VLC_FALSE ;
- }
-
/* set window size */
p_vout->p_sys->s_rect.size.width = p_vout->i_window_width;
p_vout->p_sys->s_rect.size.height = p_vout->i_window_height;
- if( ( err = EnterMovies() ) != noErr )
+ /* Check if we should use QuickTime or OpenGL */
+ p_vout->p_sys->i_opengl = config_GetInt( p_vout, "macosx-opengl" );
+
+ if( !p_vout->p_sys->i_opengl )
{
- msg_Err( p_vout, "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 );
- return( 1 );
- }
+ /* Initialize QuickTime */
+ p_vout->p_sys->h_img_descr =
+ (ImageDescriptionHandle)NewHandleClear( sizeof(ImageDescription) );
+ p_vout->p_sys->p_matrix =
+ (MatrixRecordPtr)malloc( sizeof(MatrixRecord) );
+ p_vout->p_sys->p_fullscreen_state = NULL;
- /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */
- vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock );
+ if( ( err = EnterMovies() ) != noErr )
+ {
+ msg_Err( p_vout, "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 );
+ return( 1 );
+ }
- err = FindCodec( kYUV420CodecType, bestSpeedCodec,
- nil, &p_vout->p_sys->img_dc );
-
- vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock );
- if( err == noErr && p_vout->p_sys->img_dc != 0 )
- {
- p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0');
- p_vout->p_sys->i_codec = kYUV420CodecType;
- }
- else
- {
- msg_Err( p_vout, "failed to find an appropriate codec" );
- }
+ /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */
+ vlc_mutex_lock( &p_vout->p_vlc->quicktime_lock );
- if( p_vout->p_sys->img_dc == 0 )
- {
- free( p_vout->p_sys->p_matrix );
- DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
- free( p_vout->p_sys );
- return VLC_EGENERIC;
+ err = FindCodec( kYUV420CodecType, bestSpeedCodec,
+ nil, &p_vout->p_sys->img_dc );
+
+ vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock );
+ if( err == noErr && p_vout->p_sys->img_dc != 0 )
+ {
+ p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0');
+ p_vout->p_sys->i_codec = kYUV420CodecType;
+ }
+ else
+ {
+ msg_Err( p_vout, "failed to find an appropriate codec" );
+ }
+
+ if( p_vout->p_sys->img_dc == 0 )
+ {
+ free( p_vout->p_sys->p_matrix );
+ DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
+ free( p_vout->p_sys );
+ return VLC_EGENERIC;
+ }
}
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
}
[o_pool release];
- /* We don't need a window either in the mozilla plugin */
- if( p_vout->p_sys->isplugin == 0 )
+ if( CoCreateWindow( p_vout ) )
{
- if( CoCreateWindow( p_vout ) )
+ msg_Err( p_vout, "unable to create window" );
+ if( !p_vout->p_sys->i_opengl )
{
- msg_Err( p_vout, "unable to create window" );
free( p_vout->p_sys->p_matrix );
DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
- free( p_vout->p_sys );
- return( 1 );
}
+ free( p_vout->p_sys );
+ return( 1 );
}
p_vout->pf_init = vout_Init;
{
int i_index;
picture_t *p_pic;
- vlc_value_t val;
I_OUTPUTPICTURES = 0;
p_vout->output.i_height = p_vout->render.i_height;
p_vout->output.i_aspect = p_vout->render.i_aspect;
- var_Get( p_vout->p_vlc, "drawable", &val );
-
- if( p_vout->p_sys->isplugin )
+ if( !p_vout->p_sys->i_opengl )
{
- p_vout->p_sys->p_qdport = val.i_int;
- }
-
- SetPort( p_vout->p_sys->p_qdport );
- QTScaleMatrix( p_vout );
+ SetPort( p_vout->p_sys->p_qdport );
+ QTScaleMatrix( p_vout );
- if( QTCreateSequence( p_vout ) )
+ if( QTCreateSequence( p_vout ) )
+ {
+ msg_Err( p_vout, "unable to create sequence" );
+ return( 1 );
+ }
+ }
+ else
{
- msg_Err( p_vout, "unable to create sequence" );
- return( 1 );
+ p_vout->output.i_chroma = VLC_FOURCC('Y','U','Y','2');
+ p_vout->output.i_rmask = 0xFF0000;
+ p_vout->output.i_gmask = 0x00FF00;
+ p_vout->output.i_bmask = 0x0000FF;
}
/* Try to initialize up to QT_MAX_DIRECTBUFFERS direct buffers */
- while( I_OUTPUTPICTURES < QT_MAX_DIRECTBUFFERS )
+ while( I_OUTPUTPICTURES <
+ p_vout->p_sys->i_opengl ? 1 : QT_MAX_DIRECTBUFFERS )
{
p_pic = NULL;
}
/* Allocate the picture */
- if( p_pic == NULL || QTNewPicture( p_vout, p_pic ) )
+ if( p_pic == NULL )
{
break;
}
+ if( !p_vout->p_sys->i_opengl )
+ {
+ if( QTNewPicture( p_vout, p_pic ) )
+ {
+ break;
+ }
+ }
+ else
+ {
+ /* Nothing special to do, we just need a basic allocated
+ picture_t */
+ vout_AllocatePicture( p_vout, p_pic, p_vout->output.i_chroma,
+ p_vout->output.i_width, p_vout->output.i_height,
+ p_vout->output.i_aspect );
+ }
+
p_pic->i_status = DESTROYED_PICTURE;
p_pic->i_type = DIRECT_PICTURE;
I_OUTPUTPICTURES++;
}
+ if( p_vout->p_sys->i_opengl )
+ {
+ [p_vout->p_sys->o_glview lockFocus];
+ [p_vout->p_sys->o_glview initTextures];
+ [p_vout->p_sys->o_glview unlockFocus];
+ }
+
return( 0 );
}
{
int i_index;
- QTDestroySequence( p_vout );
+ if( !p_vout->p_sys->i_opengl )
+ {
+ QTDestroySequence( p_vout );
+ }
/* Free the direct buffers we allocated */
for( i_index = I_OUTPUTPICTURES; i_index; )
{
i_index--;
- QTFreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] );
+ if( !p_vout->p_sys->i_opengl )
+ {
+ QTFreePicture( p_vout, PP_OUTPUTPICTURE[ i_index ] );
+ }
+ else
+ {
+ free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
+ }
}
}
*****************************************************************************/
void E_(CloseVideo) ( vlc_object_t *p_this )
{
- vout_thread_t * p_vout = (vout_thread_t *)p_this;
+ vout_thread_t * p_vout = (vout_thread_t *)p_this;
- if ( !p_vout->p_sys->isplugin )
+ if( CoDestroyWindow( p_vout ) )
{
- if( CoDestroyWindow( p_vout ) )
- {
- msg_Err( p_vout, "unable to destroy window" );
- }
+ msg_Err( p_vout, "unable to destroy window" );
}
- if ( p_vout->p_sys->p_fullscreen_state != NULL )
- EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
+ if( !p_vout->p_sys->i_opengl )
+ {
+ if ( p_vout->p_sys->p_fullscreen_state != NULL )
+ EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
- ExitMovies();
+ ExitMovies();
- free( p_vout->p_sys->p_matrix );
- DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
+ free( p_vout->p_sys->p_matrix );
+ DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
+ }
free( p_vout->p_sys );
}
*****************************************************************************/
static int vout_Manage( vout_thread_t *p_vout )
{
- vlc_value_t val1;
- var_Get( p_vout->p_vlc, "drawableredraw", &val1 );
-
if( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE )
{
if( CoToggleFullscreen( p_vout ) )
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
- if( (p_vout->i_changes & VOUT_SIZE_CHANGE) ||
- ( p_vout->p_sys->isplugin && val1.i_int == 1) )
+ if( p_vout->i_changes & VOUT_SIZE_CHANGE )
{
- if( p_vout->p_sys->isplugin )
- {
- val1.i_int = 0;
- var_Set( p_vout->p_vlc, "drawableredraw", val1 );
- QTScaleMatrix( p_vout );
- SetDSequenceMask( p_vout->p_sys->i_seq , p_vout->p_sys->mask );
- }
- else
+ if( !p_vout->p_sys->i_opengl )
{
QTScaleMatrix( p_vout );
SetDSequenceMatrix( p_vout->p_sys->i_seq,
p_vout->p_sys->p_matrix );
- p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
}
+
+ p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
}
/* hide/show mouse cursor
* it has to deal with multiple monitors and therefore checks a lot */
if( !p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen )
{
- if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 &&
- p_vout->p_sys->b_mouse_pointer_visible )
+ if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 3000000 )
{
VLCHideMouse( p_vout, YES );
}
- else if ( !p_vout->p_sys->b_mouse_pointer_visible )
- {
- vlc_bool_t b_playing = NO;
- input_thread_t * p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
-
- if ( p_input != NULL )
- {
- vlc_value_t state;
- var_Get( p_input, "state", &state );
- b_playing = state.i_int != PAUSE_S;
- vlc_object_release( p_input );
- }
- if ( !b_playing )
- {
- VLCHideMouse( p_vout, NO );
- }
- }
}
else if ( p_vout->p_sys->b_mouse_moved && p_vout->b_fullscreen )
{
- if( !p_vout->p_sys->b_mouse_pointer_visible )
- {
- VLCHideMouse( p_vout, NO );
- }
- else
- {
- p_vout->p_sys->b_mouse_moved = NO;
- }
+ VLCHideMouse( p_vout, NO );
}
+ /* disable screen saver */
+ UpdateSystemActivity( UsrActivity );
+
return( 0 );
}
*****************************************************************************/
static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic )
{
- OSErr err;
- CodecFlags flags;
- Rect oldrect;
- RgnHandle oldClip;
-
- if( p_vout->p_sys->isplugin )
+ if( !p_vout->p_sys->i_opengl )
{
- oldClip = NewRgn();
-
- /* In mozilla plugin, mozilla browser also draws things in
- * the windows. So we have to update the port/Origin for each
- * picture. FIXME : the vout should lock something ! */
- GetPort( &p_vout->p_sys->p_qdportold );
- GetPortBounds( p_vout->p_sys->p_qdportold, &oldrect );
- GetClip( oldClip );
+ OSErr err;
+ CodecFlags flags;
- LockPortBits( p_vout->p_sys->p_qdport );
-
- SetPort( p_vout->p_sys->p_qdport );
- SetOrigin( p_vout->p_sys->portx , p_vout->p_sys->porty );
- ClipRect( &p_vout->p_sys->rect );
-
-
if( ( err = DecompressSequenceFrameS(
p_vout->p_sys->i_seq,
p_pic->p_sys->p_info,
}
else
{
- QDFlushPortBuffer( p_vout->p_sys->p_qdport, p_vout->p_sys->mask );
+ QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil );
}
-
-
- SetOrigin( oldrect.left , oldrect.top );
- SetClip( oldClip );
- SetPort( p_vout->p_sys->p_qdportold );
-
- UnlockPortBits( p_vout->p_sys->p_qdport );
-
}
else
- {
- if( ( err = DecompressSequenceFrameS(
- p_vout->p_sys->i_seq,
- p_pic->p_sys->p_info,
- p_pic->p_sys->i_size,
- codecFlagUseImageBuffer, &flags, nil ) != noErr ) )
+ {
+ if( [p_vout->p_sys->o_glview lockFocusIfCanDraw] )
{
- msg_Warn( p_vout, "DecompressSequenceFrameS failed: %d", err );
- }
- else
- {
- QDFlushPortBuffer( p_vout->p_sys->p_qdport, nil );
+ /* Texture gotta be reload before the buffer is filled
+ (thanks to gcc from arstechnica forums) */
+ [p_vout->p_sys->o_glview drawRect:
+ [p_vout->p_sys->o_glview bounds]];
+ [p_vout->p_sys->o_glview reloadTexture];
+ [p_vout->p_sys->o_glview unlockFocus];
}
}
}
static int CoSendRequest( vout_thread_t *p_vout, SEL sel )
{
int i_ret = 0;
+ vlc_value_t val;
+ intf_thread_t * p_intf;
VLCVout * o_vlv = [[VLCVout alloc] init];
[o_vlv release];
+ /*This makes this function dependant of the presence of a macosx
+ interface. We do not check if this interface exists, since it has
+ already been done before.*/
+
+ p_intf = [NSApp getIntf];
+
+ val.b_bool = VLC_TRUE;
+ var_Create(p_intf,"intf-change",VLC_VAR_BOOL);
+ var_Set(p_intf, "intf-change",val);
+
return( i_ret );
}
msg_Err( p_vout, "CoSendRequest (createWindow) failed" );
return( 1 );
}
-
+
return( 0 );
}
*****************************************************************************/
static int CoDestroyWindow( vout_thread_t *p_vout )
{
- if( !p_vout->p_sys->b_mouse_pointer_visible )
- {
- VLCHideMouse( p_vout, NO );
- }
+
+ VLCHideMouse( p_vout, NO );
if( CoSendRequest( p_vout, @selector(destroyWindow:) ) )
{
*****************************************************************************/
static int CoToggleFullscreen( vout_thread_t *p_vout )
{
+ if( p_vout->p_sys->i_opengl )
+ {
+ /* TODO */
+ return 0;
+ }
+
QTDestroySequence( p_vout );
if( CoDestroyWindow( p_vout ) )
p_vout->b_fullscreen = !p_vout->b_fullscreen;
- config_PutInt( p_vout, "fullscreen", p_vout->b_fullscreen );
-
if( CoCreateWindow( p_vout ) )
{
msg_Err( p_vout, "unable to create window" );
return( 1 );
}
+ SetPort( p_vout->p_sys->p_qdport );
+ QTScaleMatrix( p_vout );
+
if( QTCreateSequence( p_vout ) )
{
msg_Err( p_vout, "unable to create sequence" );
if ( b_hide && b_inside )
{
- /* only hide if mouse over VLCView */
- [NSCursor hide];
- p_vout->p_sys->b_mouse_pointer_visible = 0;
+ /* only hide if mouse over VLCQTView */
+ [NSCursor setHiddenUntilMouseMoves: YES];
}
else if ( !b_hide )
{
- [NSCursor unhide];
- p_vout->p_sys->b_mouse_pointer_visible = 1;
+ [NSCursor setHiddenUntilMouseMoves: NO];
}
p_vout->p_sys->b_mouse_moved = NO;
p_vout->p_sys->i_time_mouse_last_moved = mdate();
Fixed factor_x, factor_y;
unsigned int i_offset_x = 0;
unsigned int i_offset_y = 0;
- vlc_value_t val;
- vlc_value_t valt;
- vlc_value_t vall;
- vlc_value_t valb;
- vlc_value_t valr;
- vlc_value_t valx;
- vlc_value_t valy;
- vlc_value_t valw;
- vlc_value_t valh;
- vlc_value_t valportx;
- vlc_value_t valporty;
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;
- 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 );
-
- if( p_vout->p_sys->isplugin )
- {
- p_vout->p_sys->portx = valportx.i_int;
- p_vout->p_sys->porty = valporty.i_int;
- p_vout->p_sys->p_qdport = val.i_int;
- i_width = valw.i_int;
- i_height = valh.i_int;
-
- SetRectRgn( p_vout->p_sys->mask , vall.i_int - valx.i_int ,
- valt.i_int - valy.i_int , valr.i_int - valx.i_int ,
- valb.i_int - valy.i_int );
- p_vout->p_sys->rect.top = 0;
- p_vout->p_sys->rect.left = 0;
- p_vout->p_sys->rect.bottom = valb.i_int - valt.i_int;
- p_vout->p_sys->rect.right = valr.i_int - vall.i_int;
- }
-
if( i_height * p_vout->output.i_aspect < i_width * VOUT_ASPECT_FACTOR )
{
int i_adj_width = i_height * p_vout->output.i_aspect /
factor_y = FixDiv( Long2Fix( i_height ),
Long2Fix( p_vout->output.i_height ) );
- i_offset_x = (i_width - i_adj_width) / 2 + i_offset_x;
+ i_offset_x = (i_width - i_adj_width) / 2;
}
else
{
factor_y = FixDiv( Long2Fix( i_adj_height ),
Long2Fix( p_vout->output.i_height ) );
- i_offset_y = (i_height - i_adj_height) / 2 + i_offset_y;
+ i_offset_y = (i_height - i_adj_height) / 2;
}
SetIdentityMatrix( p_vout->p_sys->p_matrix );
p_descr->dataSize = 0;
p_descr->depth = 24;
-
HUnlock( (Handle)p_vout->p_sys->h_img_descr );
-
if( ( err = DecompressSequenceBeginS(
&p_vout->p_sys->i_seq,
p_vout->p_sys->h_img_descr,
p_vout->p_sys->p_qdport,
NULL, NULL,
p_vout->p_sys->p_matrix,
- 0, p_vout->p_sys->mask,
+ 0, NULL,
codecFlagUseImageBuffer,
codecLosslessQuality,
p_vout->p_sys->img_dc ) ) )
return( 1 );
}
-
return( 0 );
}
newsize.width = (int) ( p_vout->render.i_width * factor );
newsize.height = (int) ( i_corrected_height * factor );
}
-
+
[self setContentSize: newsize];
[self setFrameTopLeftPoint: topleftscreen];
- (void)toggleFloatOnTop
{
- if( config_GetInt( p_vout, "macosx-float" ) )
+ if( config_GetInt( p_vout, "video-on-top" ) )
{
- config_PutInt( p_vout, "macosx-float", 0 );
+ config_PutInt( p_vout, "video-on-top", 0 );
[p_vout->p_sys->o_window setLevel: NSNormalWindowLevel];
}
else
{
- config_PutInt( p_vout, "macosx-float", 1 );
+ config_PutInt( p_vout, "video-on-top", 1 );
[p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
}
}
- (void)toggleFullscreen
{
+ config_PutInt(p_vout, "fullscreen", !p_vout->b_fullscreen);
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
}
if( key )
{
- val.i_int |= CocoaConvertKey( key );
- var_Set( p_vout->p_vlc, "key-pressed", val );
+ /* Escape should always get you out of fullscreen */
+ if( key == (unichar) 0x1b )
+ {
+ if( [self isFullscreen] )
+ {
+ [self toggleFullscreen];
+ }
+ }
+ else if ( key == ' ' )
+ {
+ playlist_t *p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if ( p_playlist != NULL )
+ {
+ playlist_Pause( p_playlist );
+ vlc_object_release( p_playlist);
+ }
+ }
+ else
+ {
+ val.i_int |= CocoaKeyToVLC( key );
+ var_Set( p_vout->p_vlc, "key-pressed", val );
+ }
}
else
{
@end
/*****************************************************************************
- * VLCView implementation
+ * VLCQTView implementation
*****************************************************************************/
-@implementation VLCView
+@implementation VLCQTView
- (void)drawRect:(NSRect)rect
{
p_vout->p_sys->i_time_mouse_last_moved = mdate();
p_vout->p_sys->b_mouse_moved = YES;
}
- else if ( !b_inside && !p_vout->p_sys->b_mouse_pointer_visible )
+
+ [super mouseMoved: o_event];
+}
+
+@end
+
+/*****************************************************************************
+ * VLCGLView implementation
+ *****************************************************************************/
+@implementation VLCGLView
+
+
+- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) _p_vout
+{
+ p_vout = _p_vout;
+
+ NSOpenGLPixelFormatAttribute attribs[] =
{
- /* people with multiple monitors need their mouse,
- * even if VLCView in fullscreen. */
- VLCHideMouse( p_vout, NO );
+ NSOpenGLPFAAccelerated,
+ NSOpenGLPFANoRecovery,
+ NSOpenGLPFADoubleBuffer,
+ NSOpenGLPFAWindow,
+ 0
+ };
+
+ NSOpenGLPixelFormat * fmt = [[NSOpenGLPixelFormat alloc]
+ initWithAttributes: attribs];
+
+ if( !fmt )
+ {
+ fprintf( stderr, "Cannot create NSOpenGLPixelFormat\n" );
+ return nil;
}
+
+ self = [super initWithFrame:frame pixelFormat: fmt];
+
+ [[self openGLContext] makeCurrentContext];
+ [[self openGLContext] update];
+
+ glClearColor( 0.0, 0.0, 0.0, 0.0 );
+
+ b_init_done = 0;
+
+ return self;
+}
+
+- (void) reshape
+{
+ [[self openGLContext] makeCurrentContext];
+
+ NSRect bounds = [self bounds];
+
+ glViewport( 0, 0, (GLint) bounds.size.width,
+ (GLint) bounds.size.height );
+
+ /* Quad size is set in order to preserve the aspect ratio */
+ if( bounds.size.height * p_vout->output.i_aspect <
+ bounds.size.width * VOUT_ASPECT_FACTOR )
+ {
+ f_x = bounds.size.height * p_vout->render.i_aspect /
+ VOUT_ASPECT_FACTOR / bounds.size.width;
+ f_y = 1.0;
+ }
+ else
+ {
+ f_x = 1.0;
+ f_y = bounds.size.width * VOUT_ASPECT_FACTOR /
+ p_vout->render.i_aspect / bounds.size.height;
+ }
+}
+
+- (void) initTextures
+{
+ [[self openGLContext] makeCurrentContext];
+
+ /* Create textures */
+ glGenTextures( 1, &i_texture );
+
+ glEnable( GL_TEXTURE_RECTANGLE_EXT );
+ glEnable( GL_UNPACK_CLIENT_STORAGE_APPLE );
+
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
+
+ /* Use VRAM texturing */
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_STORAGE_HINT_APPLE, GL_STORAGE_CACHED_APPLE );
+
+ /* Tell the driver not to make a copy of the texture but to use
+ our buffer */
+ glPixelStorei( GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE );
+
+ /* Linear interpolation */
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+
+ /* I have no idea what this exactly does, but it seems to be
+ necessary for scaling */
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+ glTexParameteri( GL_TEXTURE_RECTANGLE_EXT,
+ GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );
+
+ glTexImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, GL_RGBA,
+ p_vout->output.i_width, p_vout->output.i_height, 0,
+ GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE,
+ PP_OUTPUTPICTURE[0]->p_data );
+
+ b_init_done = 1;
+}
+
+- (void) reloadTexture
+{
+ [[self openGLContext] makeCurrentContext];
+
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
+
+ /* glTexSubImage2D is faster than glTexImage2D
+ http://developer.apple.com/samplecode/Sample_Code/Graphics_3D/
+ TextureRange/MainOpenGLView.m.htm */
+ glTexSubImage2D( GL_TEXTURE_RECTANGLE_EXT, 0, 0, 0,
+ p_vout->output.i_width, p_vout->output.i_height,
+ GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE,
+ PP_OUTPUTPICTURE[0]->p_data );
+}
+
+- (void) drawRect: (NSRect) rect
+{
+ [[self openGLContext] makeCurrentContext];
+
+ /* Swap buffers only during the vertical retrace of the monitor.
+ http://developer.apple.com/documentation/GraphicsImaging/
+ Conceptual/OpenGL/chap5/chapter_5_section_44.html */
+ long params[] = { 1 };
+ CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval,
+ params );
- [super mouseMoved: o_event];
+ /* Black background */
+ glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+
+ if( !b_init_done )
+ {
+ [[self openGLContext] flushBuffer];
+ return;
+ }
+
+ /* Draw a quad with our texture on it */
+ glBindTexture( GL_TEXTURE_RECTANGLE_EXT, i_texture );
+ glBegin( GL_QUADS );
+ /* Top left */
+ glTexCoord2f( 0.0, 0.0 );
+ glVertex2f( - f_x, f_y );
+ /* Bottom left */
+ glTexCoord2f( 0.0, (float) p_vout->output.i_height );
+ glVertex2f( - f_x, - f_y );
+ /* Bottom right */
+ glTexCoord2f( (float) p_vout->output.i_width,
+ (float) p_vout->output.i_height );
+ glVertex2f( f_x, - f_y );
+ /* Top right */
+ glTexCoord2f( (float) p_vout->output.i_width, 0.0 );
+ glVertex2f( f_x, f_y );
+ glEnd();
+
+ /* Wait for the job to be done */
+ [[self openGLContext] flushBuffer];
}
@end
- (void)createWindow:(NSValue *)o_value
{
vlc_value_t val;
- VLCView * o_view;
+ VLCQTView * o_view;
NSScreen * o_screen;
vout_thread_t * p_vout;
vlc_bool_t b_main_screen;
}
}
+ if( p_vout->p_sys->i_opengl )
+ {
+ /* XXX Fix fullscreen mode */
+ p_vout->b_fullscreen = 0;
+ }
+
if( p_vout->b_fullscreen )
{
NSRect screen_rect = [o_screen frame];
NSClosableWindowMask |
NSResizableWindowMask;
- if ( p_vout->p_sys->p_fullscreen_state != NULL )
- EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
- p_vout->p_sys->p_fullscreen_state = NULL;
+ if( !p_vout->p_sys->i_opengl )
+ {
+ if ( p_vout->p_sys->p_fullscreen_state != NULL )
+ EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
+ p_vout->p_sys->p_fullscreen_state = NULL;
+ }
[p_vout->p_sys->o_window
initWithContentRect: p_vout->p_sys->s_rect
[p_vout->p_sys->o_window setAlphaValue: config_GetFloat( p_vout, "macosx-opaqueness" )];
- if( config_GetInt( p_vout, "macosx-float" ) )
+ if( config_GetInt( p_vout, "video-on-top" ) )
{
[p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
}
}
}
- o_view = [[VLCView alloc] init];
-
- /* FIXME: [o_view setMenu:] */
- [p_vout->p_sys->o_window setContentView: o_view];
- [o_view autorelease];
-
- [o_view lockFocus];
- p_vout->p_sys->p_qdport = [o_view qdPort];
-
- [o_view unlockFocus];
+ if( !p_vout->p_sys->i_opengl )
+ {
+ o_view = [[VLCQTView alloc] init];
+ /* FIXME: [o_view setMenu:] */
+ [p_vout->p_sys->o_window setContentView: o_view];
+ [o_view autorelease];
+
+ [o_view lockFocus];
+ p_vout->p_sys->p_qdport = [o_view qdPort];
+ [o_view unlockFocus];
+ }
+ else
+ {
+#define o_glview p_vout->p_sys->o_glview
+ o_glview = [[VLCGLView alloc] initWithFrame: p_vout->p_sys->s_rect vout: p_vout];
+ [p_vout->p_sys->o_window setContentView: o_glview];
+ [o_glview autorelease];
+#undef o_glview
+ }
[p_vout->p_sys->o_window updateTitle];
[p_vout->p_sys->o_window makeKeyAndOrderFront: nil];
+
}
- (void)destroyWindow:(NSValue *)o_value
projects / vlc / blobdiff