@interface VLCOpenGLVideoView : NSOpenGLView
{
vout_display_t *vd;
+ BOOL _hasPendingReshape;
}
- (void)setVoutDisplay:(vout_display_t *)vd;
+- (void)setVoutFlushing:(BOOL)flushing;
@end
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;
}
}
}
+
+/**
+ * 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.
*/
{
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);
}
/**
}
[self lockgl];
- glClearColor(0, 0, 0, 1);
+
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;