set_capability("vout display", 300)
set_callbacks(Open, Close)
- add_shortcut("macosx")
- add_shortcut("vout_macosx")
+ add_shortcut("macosx", "vout_macosx")
vlc_module_end ()
/**
@interface VLCOpenGLVideoView : NSOpenGLView
{
vout_display_t *vd;
+ BOOL _hasPendingReshape;
}
- (void)setVoutDisplay:(vout_display_t *)vd;
+- (void)setVoutFlushing:(BOOL)flushing;
@end
-
+
struct vout_display_sys_t
{
VLCOpenGLVideoView *glView;
id<VLCOpenGLVideoViewEmbedding> container;
+ vout_window_t *embed;
vout_opengl_t gl;
vout_display_opengl_t vgl;
-
+
picture_pool_t *pool;
picture_t *current;
bool has_first_frame;
vd->sys = sys;
sys->pool = NULL;
sys->gl.sys = NULL;
-
+ sys->embed = NULL;
+
/* Get the drawable object */
id container = var_CreateGetAddress(vd, "drawable-nsobject");
- if (!container)
+ if (container)
{
- msg_Dbg(vd, "No drawable-nsobject, passing over.");
- goto error;
+ vout_display_DeleteWindow(vd, NULL);
+ }
+ else
+ {
+ vout_window_cfg_t wnd_cfg;
+
+ memset (&wnd_cfg, 0, sizeof (wnd_cfg));
+ wnd_cfg.type = VOUT_WINDOW_TYPE_NSOBJECT;
+ wnd_cfg.x = var_InheritInteger (vd, "video-x");
+ wnd_cfg.y = var_InheritInteger (vd, "video-y");
+ wnd_cfg.width = vd->cfg->display.width;
+ wnd_cfg.height = vd->cfg->display.height;
+
+ sys->embed = vout_display_NewWindow (vd, &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.");
+ goto error;
+ }
}
/* This will be released in Close(), on
/* Get our main view*/
nsPool = [[NSAutoreleasePool alloc] init];
- sys->glView = [[VLCOpenGLVideoView alloc] init];
+ [VLCOpenGLVideoView performSelectorOnMainThread:@selector(getNewView:) withObject:[NSValue valueWithPointer:&sys->glView] waitUntilDone:YES];
if (!sys->glView)
goto error;
/* We don't wait, that means that we'll have to be careful about releasing
* container.
* That's why we'll release on main thread in Close(). */
- [(id)container performSelectorOnMainThread:@selector(addVoutSubview:) withObject:sys->glView waitUntilDone:NO];
+ if ([(id)container respondsToSelector:@selector(addVoutSubview:)])
+ [(id)container performSelectorOnMainThread:@selector(addVoutSubview:) withObject:sys->glView waitUntilDone:NO];
+ else if ([container isKindOfClass:[NSView class]])
+ {
+ NSView *parentView = container;
+ [parentView performSelectorOnMainThread:@selector(addSubview:) withObject:sys->glView waitUntilDone:NO];
+ [sys->glView performSelectorOnMainThread:@selector(setFrameWithValue:) withObject:[NSValue valueWithRect:[parentView bounds]] waitUntilDone:NO];
+ }
+ else
+ {
+ msg_Err(vd, "Invalid drawable-nsobject object. drawable-nsobject must either be an NSView or comply to the @protocol VLCOpenGLVideoViewEmbedding.");
+ goto error;
+ }
+
+
[nsPool release];
nsPool = nil;
sys->gl.unlock = OpenglUnlock;
sys->gl.swap = OpenglSwap;
sys->gl.sys = sys;
-
+
if (vout_display_opengl_Init(&sys->vgl, &vd->fmt, &sys->gl))
{
sys->gl.sys = NULL;
/* */
vout_display_info_t info = vd->info;
info.has_pictures_invalid = false;
-
+
/* Setup vout_display_t once everything is fine */
vd->info = info;
-
+
vd->pool = Pool;
vd->prepare = PictureRender;
vd->display = PictureDisplay;
[sys->glView setVoutDisplay:nil];
var_Destroy(vd, "drawable-nsobject");
- /* This will retain sys->glView */
- [(id)sys->container performSelectorOnMainThread:@selector(removeVoutSubview:) withObject:sys->glView waitUntilDone:NO];
+ 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_Clean(&sys->vgl);
+ if (sys->embed)
+ vout_display_DeleteWindow(vd, sys->embed);
free (sys);
}
{
vout_display_sys_t *sys = vd->sys;
-
+
vout_display_opengl_Prepare( &sys->vgl, pic );
}
static void PictureDisplay(vout_display_t *vd, picture_t *pic)
{
vout_display_sys_t *sys = vd->sys;
+ [sys->glView setVoutFlushing:YES];
vout_display_opengl_Display(&sys->vgl, &vd->fmt );
+ [sys->glView setVoutFlushing:NO];
picture_Release (pic);
sys->has_first_frame = true;
}
static int Control (vout_display_t *vd, int query, va_list ap)
{
vout_display_sys_t *sys = vd->sys;
-
+
switch (query)
{
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- case VOUT_DISPLAY_CHANGE_ON_TOP:
+ case VOUT_DISPLAY_CHANGE_FULLSCREEN:
+ case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
}
case VOUT_DISPLAY_HIDE_MOUSE:
return VLC_SUCCESS;
-
+
case VOUT_DISPLAY_GET_OPENGL:
{
vout_opengl_t **gl = va_arg (ap, vout_opengl_t **);
*gl = &sys->gl;
return VLC_SUCCESS;
}
-
+
case VOUT_DISPLAY_RESET_PICTURES:
assert (0);
default:
msg_Err (vd, "Unknown request in Mac OS X vout display");
return VLC_EGENERIC;
}
- printf("query %d\n", query);
}
/*****************************************************************************
[context makeCurrentContext];
return 0;
}
- return 1;
+ return 1;
}
static void OpenglUnlock(vout_opengl_t *gl)
#define VLCAssertMainThread() assert([[NSThread currentThread] isMainThread])
++ (void)getNewView:(NSValue *)value
+{
+ id *ret = [value pointerValue];
+ *ret = [[self alloc] init];
+}
+
/**
* Gets called by the Open() method.
- * (Non main thread).
*/
- (id)init
{
+ VLCAssertMainThread();
+
/* Warning - this may be called on non main thread */
NSOpenGLPixelFormatAttribute attribs[] =
NSOpenGLPFAWindow,
0
};
-
- NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes: attribs];
-
+
+ NSOpenGLPixelFormat *fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attribs];
+
if (!fmt)
return nil;
self = [super initWithFrame:NSMakeRect(0,0,10,10) pixelFormat:fmt];
+ [fmt release];
+
if (!self)
return nil;
Conceptual/OpenGL/chap5/chapter_5_section_44.html */
GLint params[] = { 1 };
CGLSetParameter([[self openGLContext] CGLContextObj], kCGLCPSwapInterval, params);
-
+
+ [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+ return self;
+}
+
+/**
+ * Gets called by the Open() method.
+ */
+- setFrameWithValue:(NSValue *)value
+{
+ [self setFrame:[value rectValue]];
}
/**
}
}
+
+/**
+ * Gets called when the vout will aquire the lock and flush.
+ * (Non main thread).
+ */
+- (void)setVoutFlushing:(BOOL)flushing
+{
+ if (!flushing)
+ return;
+ @synchronized(self) {
+ _hasPendingReshape = NO;
+ }
+}
+
+/**
+ * Can -drawRect skip rendering?.
+ */
+- (BOOL)canSkipRendering
+{
+ VLCAssertMainThread();
+
+ @synchronized(self) {
+ BOOL hasFirstFrame = vd && vd->sys->has_first_frame;
+ return !_hasPendingReshape && hasFirstFrame;
+ }
+}
+
+
/**
* Local method that locks the gl context.
*/
- (BOOL)lockgl
{
VLCAssertMainThread();
- CGLError err = CGLLockContext([[self openGLContext] CGLContextObj]);
+ NSOpenGLContext *context = [self openGLContext];
+ CGLError err = CGLLockContext([context CGLContextObj]);
+ if (err == kCGLNoError)
+ [context makeCurrentContext];
return err == kCGLNoError;
}
{
VLCAssertMainThread();
+ // We may have taken some times to take the opengl Lock.
+ // Check here to see if we can just skip the frame as well.
+ if ([self canSkipRendering])
+ return;
+
+ BOOL hasFirstFrame;
@synchronized(self) { // vd can be accessed from multiple threads
- if (vd && vd->sys->has_first_frame)
- {
- // This will lock gl.
- vout_display_opengl_Display( &vd->sys->vgl, &vd->source );
- }
- else {
- glClear(GL_COLOR_BUFFER_BIT);
- }
-
- }
+ hasFirstFrame = vd && vd->sys->has_first_frame;
+ }
+
+ if (hasFirstFrame) {
+ // This will lock gl.
+ vout_display_opengl_Display( &vd->sys->vgl, &vd->source );
+ }
+ else
+ glClear(GL_COLOR_BUFFER_BIT);
}
/**
- (void)reshape
{
VLCAssertMainThread();
-
+
NSRect bounds = [self bounds];
CGFloat height = bounds.size.height;
if (vd) {
CGFloat videoHeight = vd->source.i_visible_height;
CGFloat videoWidth = vd->source.i_visible_width;
-
+
GLint sarNum = vd->source.i_sar_num;
GLint sarDen = vd->source.i_sar_den;
-
+
if (height * videoWidth * sarNum < width * videoHeight * sarDen)
{
x = (height * videoWidth * sarNum) / (videoHeight * sarDen);
{
x = width;
y = (width * videoHeight * sarDen) / (videoWidth * sarNum);
- }
+ }
}
}
-
- [self lockgl];
- glClearColor(0, 0, 0, 1);
- glViewport((width - x) / 2, (height - y) / 2, x, y);
- [self unlockgl];
- [super reshape];
+ if ([self lockgl]) {
+ glViewport((width - x) / 2, (height - y) / 2, x, y);
+
+ @synchronized(self) {
+ // This may be cleared before -drawRect is being called,
+ // in this case we'll skip the rendering.
+ // This will save us for rendering two frames (or more) for nothing
+ // (one by the vout, one (or more) by drawRect)
+ _hasPendingReshape = YES;
+ }
+
+ [self unlockgl];
+
+ [super reshape];
+ }
}
/**
- (void)drawRect:(NSRect) rect
{
VLCAssertMainThread();
+
+ if ([self canSkipRendering])
+ return;
+
BOOL success = [self lockgl];
if (!success)
return;
[self unlockgl];
}
+- (void)renewGState
+{
+ NSWindow *window = [self window];
+
+ // Remove flashes with splitter view.
+ if ([window respondsToSelector:@selector(disableScreenUpdatesUntilFlush)])
+ [window disableScreenUpdatesUntilFlush];
+
+ [super renewGState];
+}
+
- (BOOL)mouseDownCanMoveWindow
{
return YES;
}
+
+- (BOOL)isOpaque
+{
+ return YES;
+}
@end
projects / vlc / blobdiff