/*****************************************************************************
* macosx.m: MacOS X OpenGL provider
*****************************************************************************
- * Copyright (C) 2001-2012 the VideoLAN team
+ * Copyright (C) 2001-2013 VLC authors and VideoLAN
* $Id$
*
- * Authors: Colin Delacroix <colin@zoy.org>
- * Florian G. Pflug <fgp@phlo.org>
- * Jon Lech Johansen <jon-vl@nanocrew.net>
- * Derk-Jan Hartman <hartman at videolan dot org>
+ * Authors: Derk-Jan Hartman <hartman at videolan dot org>
* Eric Petit <titer@m0k.org>
* Benjamin Pracht <bigben at videolan dot org>
* Damien Fouilleul <damienf at videolan dot org>
* Pierre d'Herbemont <pdherbemont at videolan dot org>
* Felix Paul Kühne <fkuehne at videolan dot org>
* David Fuhrmann <david dot fuhrmann at googlemail dot com>
+ * Rémi Denis-Courmont
+ * Juho Vähä-Herttua <juhovh at iki dot fi>
+ * Laurent Aimar <fenrir _AT_ videolan _DOT_ 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
vlc_module_begin ()
/* Will be loaded even without interface module. see voutgl.m */
set_shortname ("Mac OS X")
- set_description (N_("Mac OS X OpenGL video output (requires drawable-nsobject)"))
+ set_description (N_("Mac OS X OpenGL video output"))
set_category (CAT_VIDEO)
- set_subcategory (SUBCAT_VIDEO_VOUT )
+ set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", 300)
set_callbacks (Open, Close)
return VLC_ENOMEM;
if (!CGDisplayUsesOpenGLAcceleration (kCGDirectMainDisplay))
- {
msg_Err (this, "no OpenGL hardware acceleration found. this can lead to slow output and unexpected results");
- dialog_Fatal (this, _("OpenGL acceleration is not supported on your Mac"), _("Your Mac lacks Quartz Extreme acceleration, which is required for video output. It will still work, but much slower and with possibly unexpected results."));
- }
- else
- msg_Dbg (this, "Quartz Extreme acceleration is active");
vd->sys = sys;
sys->pool = NULL;
/* Get the drawable object */
id container = var_CreateGetAddress (vd, "drawable-nsobject");
if (container)
- {
vout_display_DeleteWindow (vd, NULL);
- }
- else
- {
+ else {
vout_window_cfg_t wnd_cfg;
memset (&wnd_cfg, 0, sizeof (wnd_cfg));
if (sys->embed)
container = sys->embed->handle.nsobject;
- if (!container)
- {
- msg_Dbg(vd, "No drawable-nsobject nor vout_window_t found, passing over.");
+ if (!container) {
+ msg_Err(vd, "No drawable-nsobject nor vout_window_t found, passing over.");
goto error;
}
}
nsPool = [[NSAutoreleasePool alloc] init];
[VLCOpenGLVideoView performSelectorOnMainThread:@selector(getNewView:) withObject:[NSValue valueWithPointer:&sys->glView] waitUntilDone:YES];
- if (!sys->glView)
+ if (!sys->glView) {
+ msg_Err(vd, "Initialization of open gl view failed");
goto error;
+ }
[sys->glView setVoutDisplay:vd];
* That's why we'll release on main thread in Close(). */
if ([(id)container respondsToSelector:@selector(addVoutSubview:)])
[(id)container performSelectorOnMainThread:@selector(addVoutSubview:) withObject:sys->glView waitUntilDone:NO];
- else if ([container isKindOfClass:[NSView class]])
- {
+ else if ([container isKindOfClass:[NSView class]]) {
NSView *parentView = container;
[parentView performSelectorOnMainThread:@selector(addSubview:) withObject:sys->glView waitUntilDone:NO];
[sys->glView performSelectorOnMainThread:@selector(setFrameToBoundsOfView:) withObject:[NSValue valueWithPointer:parentView] waitUntilDone:NO];
- }
- else
- {
+ } else {
msg_Err(vd, "Invalid drawable-nsobject object. drawable-nsobject must either be an NSView or comply to the @protocol VLCOpenGLVideoViewEmbedding.");
goto error;
}
sys->gl.getProcAddress = OurGetProcAddress;
sys->gl.sys = sys;
const vlc_fourcc_t *subpicture_chromas;
- video_format_t fmt = vd->fmt;
sys->vgl = vout_display_opengl_New (&vd->fmt, &subpicture_chromas, &sys->gl);
- if (!sys->vgl)
- {
+ if (!sys->vgl) {
+ msg_Err(vd, "Error while initializing opengl display.");
sys->gl.sys = NULL;
goto error;
}
vd->control = Control;
/* */
- vout_display_SendEventDisplaySize (vd, vd->source.i_visible_width, vd->source.i_visible_height, false);
+ vout_display_SendEventDisplaySize (vd, vd->fmt.i_visible_width, vd->fmt.i_visible_height);
return VLC_SUCCESS;
var_Destroy (vd, "drawable-nsobject");
if ([(id)sys->container respondsToSelector:@selector(removeVoutSubview:)])
- {
/* This will retain sys->glView */
[(id)sys->container performSelectorOnMainThread:@selector(removeVoutSubview:) withObject:sys->glView waitUntilDone:NO];
- }
+
/* release on main thread as explained in Open() */
[(id)sys->container performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
[sys->glView performSelectorOnMainThread:@selector(removeFromSuperview) withObject:nil waitUntilDone:NO];
- [sys->glView release];
-
if (sys->gl.sys != NULL)
vout_display_opengl_Delete (sys->vgl);
+ [sys->glView release];
+
if (sys->embed)
vout_display_DeleteWindow (vd, sys->embed);
free (sys);
{
vout_display_sys_t *sys = vd->sys;
+ if (!vd->sys)
+ return VLC_EGENERIC;
+
+ if (!sys->embed)
+ return VLC_EGENERIC;
+
switch (query)
{
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *cfg = va_arg (ap, const vout_display_cfg_t *);
- if (vout_window_SetFullScreen (sys->embed, cfg->is_fullscreen))
- return VLC_EGENERIC;
-
- return VLC_SUCCESS;
- }
- case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
- {
- unsigned state = va_arg (ap, unsigned);
- return vout_window_SetState (sys->embed, state);
- }
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
{
- if (!vd->sys)
- return VLC_EGENERIC;
-
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
id o_window = [sys->glView window];
- if (!o_window)
+ if (!o_window) {
+ [o_pool release];
return VLC_SUCCESS; // this is okay, since the event will occur again when we have a window
+ }
NSSize windowMinSize = [o_window minSize];
const vout_display_cfg_t *cfg;
const video_format_t *source;
- bool is_forced = false;
- if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT || query == VOUT_DISPLAY_CHANGE_SOURCE_CROP)
- {
+ if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT || query == VOUT_DISPLAY_CHANGE_SOURCE_CROP) {
source = (const video_format_t *)va_arg (ap, const video_format_t *);
cfg = vd->cfg;
- }
- else
- {
+ } else {
source = &vd->source;
cfg = (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *);
- if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
- is_forced = (bool)va_arg (ap, int);
}
- if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE && is_forced
- && (cfg->display.width != vd->cfg->display.width
- || cfg->display.height != vd->cfg->display.height)
- && vout_window_SetSize (sys->embed, cfg->display.width, cfg->display.height))
- return VLC_EGENERIC;
-
- /* we always use our current frame here, because we have some size constraints
+ /* we always use our current frame here, because we have some size constraints
in the ui vout provider */
vout_display_cfg_t cfg_tmp = *cfg;
NSRect bounds;
/* For resize, we call glViewport in reshape and not here.
This has the positive side effect that we avoid erratic sizing as we animate every resize. */
if (query != VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
- {
// x / y are top left corner, but we need the lower left one
glViewport (place.x, cfg_tmp.display.height - (place.y + place.height), place.width, place.height);
- }
+
[o_pool release];
return VLC_SUCCESS;
return VLC_SUCCESS;
}
- case VOUT_DISPLAY_GET_OPENGL:
- {
- vlc_gl_t **gl = va_arg (ap, vlc_gl_t **);
- *gl = &sys->gl;
- return VLC_SUCCESS;
- }
-
case VOUT_DISPLAY_RESET_PICTURES:
assert (0);
default:
static int OpenglLock (vlc_gl_t *gl)
{
vout_display_sys_t *sys = (vout_display_sys_t *)gl->sys;
+ if (!sys->glView || ![sys->glView respondsToSelector:@selector(openGLContext)])
+ return 1;
+
NSOpenGLContext *context = [sys->glView openGLContext];
CGLError err = CGLLockContext ([context CGLContextObj]);
- if (kCGLNoError == err)
- {
+ if (kCGLNoError == err) {
[context makeCurrentContext];
return 0;
}
NSOpenGLPFAAlphaSize, 8,
NSOpenGLPFADepthSize, 24,
NSOpenGLPFAWindow,
+ NSOpenGLPFAAllowOfflineRenderers,
0
};
GLint params[] = { 1 };
CGLSetParameter ([[self openGLContext] CGLContextObj], kCGLCPSwapInterval, params);
+ [[NSNotificationCenter defaultCenter] addObserverForName:NSApplicationDidChangeScreenParametersNotification
+ object:[NSApplication sharedApplication]
+ queue:nil
+ usingBlock:^(NSNotification *notification) {
+ [self performSelectorOnMainThread:@selector(reshape)
+ withObject:nil
+ waitUntilDone:NO];
+ }];
+
[self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
return self;
}
+- (void)dealloc
+{
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
/**
* Gets called by the Open() method.
*/
hasFirstFrame = vd && vd->sys->has_first_frame;
}
- if (hasFirstFrame) {
+ if (hasFirstFrame)
// This will lock gl.
vout_display_opengl_Display (vd->sys->vgl, &vd->source);
- }
else
glClear (GL_COLOR_BUFFER_BIT);
}
else
bounds = [self bounds];
vout_display_place_t place;
-
+
@synchronized(self) {
if (vd) {
vout_display_cfg_t cfg_tmp = *(vd->cfg);
vout_display_PlacePicture (&place, &vd->source, &cfg_tmp, false);
vd->sys->place = place;
- vout_display_SendEventDisplaySize (vd, bounds.size.width, bounds.size.height, vd->cfg->is_fullscreen);
+ vout_display_SendEventDisplaySize (vd, bounds.size.width, bounds.size.height);
}
}
- (void)mouseDown:(NSEvent *)o_event
{
- if ([o_event type] == NSLeftMouseDown && !([o_event modifierFlags] & NSControlKeyMask))
- {
- if ([o_event clickCount] <= 1)
- vout_display_SendEventMousePressed (vd, MOUSE_BUTTON_LEFT);
+ @synchronized (self) {
+ if (vd) {
+ if ([o_event type] == NSLeftMouseDown && !([o_event modifierFlags] & NSControlKeyMask)) {
+ if ([o_event clickCount] <= 1)
+ vout_display_SendEventMousePressed (vd, MOUSE_BUTTON_LEFT);
+ }
+ }
}
[super mouseDown:o_event];
- (void)otherMouseDown:(NSEvent *)o_event
{
- vout_display_SendEventMousePressed (vd, MOUSE_BUTTON_CENTER);
+ @synchronized (self) {
+ if (vd)
+ vout_display_SendEventMousePressed (vd, MOUSE_BUTTON_CENTER);
+ }
[super otherMouseDown: o_event];
}
- (void)mouseUp:(NSEvent *)o_event
{
- if ([o_event type] == NSLeftMouseUp)
- vout_display_SendEventMouseReleased (vd, MOUSE_BUTTON_LEFT);
+ @synchronized (self) {
+ if (vd) {
+ if ([o_event type] == NSLeftMouseUp)
+ vout_display_SendEventMouseReleased (vd, MOUSE_BUTTON_LEFT);
+ }
+ }
[super mouseUp: o_event];
}
- (void)otherMouseUp:(NSEvent *)o_event
{
- vout_display_SendEventMouseReleased (vd, MOUSE_BUTTON_CENTER);
+ @synchronized (self) {
+ if (vd)
+ vout_display_SendEventMouseReleased (vd, MOUSE_BUTTON_CENTER);
+ }
[super otherMouseUp: o_event];
}
- (void)mouseMoved:(NSEvent *)o_event
{
- NSPoint ml;
- NSRect s_rect;
- BOOL b_inside;
-
/* on HiDPI displays, the point bounds don't equal the actual pixel based bounds */
- if (OSX_LION)
- s_rect = [self convertRectToBacking:[self bounds]];
- else
- s_rect = [self bounds];
- ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
- b_inside = [self mouse: ml inRect: s_rect];
-
- if (b_inside)
- {
- @synchronized (self)
- {
- if (vd)
- {
- vout_display_place_t place = vd->sys->place;
-
- if (place.width > 0 && place.height > 0)
- {
- const int x = vd->source.i_x_offset +
- (int64_t)(ml.x - place.x) * vd->source.i_visible_width / place.width;
- const int y = vd->source.i_y_offset +
- (int64_t)((int)s_rect.size.height - (int)ml.y - place.y) * vd->source.i_visible_height / place.height;
-
- vout_display_SendEventMouseMoved (vd, x, y);
- }
+ NSPoint ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
+ NSRect videoRect = [self bounds];
+ BOOL b_inside = [self mouse: ml inRect: videoRect];
+
+ if (OSX_LION) {
+ ml = [self convertPointToBacking: ml];
+ videoRect = [self convertRectToBacking: videoRect];
+ }
+
+ if (b_inside) {
+ @synchronized (self) {
+ if (vd) {
+ vout_display_SendMouseMovedDisplayCoordinates(vd, ORIENT_NORMAL,
+ (int)ml.x, videoRect.size.height - (int)ml.y,
+ &vd->sys->place);
}
}
}
projects / vlc / blobdiff