Commit 412c7a95 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf

ios_vout2: fix crash when trying to draw OpenGL changes while the app is in the background

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent b681317e
...@@ -89,9 +89,11 @@ vlc_module_end () ...@@ -89,9 +89,11 @@ vlc_module_end ()
GLuint _frameBuffer; GLuint _frameBuffer;
BOOL _bufferNeedReset; BOOL _bufferNeedReset;
BOOL _appActive;
} }
@property (readwrite) vout_display_t* voutDisplay; @property (readwrite) vout_display_t* voutDisplay;
@property (readonly) EAGLContext* eaglContext; @property (readonly) EAGLContext* eaglContext;
@property (readonly) BOOL isAppActive;
- (void)createBuffers; - (void)createBuffers;
- (void)destroyBuffers; - (void)destroyBuffers;
...@@ -189,6 +191,8 @@ static int Open(vlc_object_t *this) ...@@ -189,6 +191,8 @@ static int Open(vlc_object_t *this)
vd->control = Control; vd->control = Control;
/* */ /* */
[[NSNotificationCenter defaultCenter] addObserver:sys->glESView selector:@selector(applicationStateChanged:) name:UIApplicationWillResignActiveNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:sys->glESView selector:@selector(applicationStateChanged:) name:UIApplicationDidBecomeActiveNotification object:nil];
[sys->glESView performSelectorOnMainThread:@selector(reshape) withObject:nil waitUntilDone:YES]; [sys->glESView performSelectorOnMainThread:@selector(reshape) withObject:nil waitUntilDone:YES];
[autoreleasePool release]; [autoreleasePool release];
...@@ -311,6 +315,7 @@ static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *sub ...@@ -311,6 +315,7 @@ static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *sub
{ {
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
sys->has_first_frame = true; sys->has_first_frame = true;
if ([sys->glESView isAppActive])
vout_display_opengl_Display(sys->vgl, &vd->source); vout_display_opengl_Display(sys->vgl, &vd->source);
picture_Release(pic); picture_Release(pic);
...@@ -324,6 +329,7 @@ static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subp ...@@ -324,6 +329,7 @@ static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subp
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
if ([sys->glESView isAppActive])
vout_display_opengl_Prepare(sys->vgl, pic, subpicture); vout_display_opengl_Prepare(sys->vgl, pic, subpicture);
} }
...@@ -350,6 +356,7 @@ static int OpenglESClean(vlc_gl_t *gl) ...@@ -350,6 +356,7 @@ static int OpenglESClean(vlc_gl_t *gl)
static void OpenglESSwap(vlc_gl_t *gl) static void OpenglESSwap(vlc_gl_t *gl)
{ {
vout_display_sys_t *sys = (vout_display_sys_t *)gl->sys; vout_display_sys_t *sys = (vout_display_sys_t *)gl->sys;
if ([sys->glESView isAppActive])
[[sys->glESView eaglContext] presentRenderbuffer:GL_RENDERBUFFER]; [[sys->glESView eaglContext] presentRenderbuffer:GL_RENDERBUFFER];
} }
...@@ -357,7 +364,7 @@ static void OpenglESSwap(vlc_gl_t *gl) ...@@ -357,7 +364,7 @@ static void OpenglESSwap(vlc_gl_t *gl)
* Our UIView object * Our UIView object
*****************************************************************************/ *****************************************************************************/
@implementation VLCOpenGLES2VideoView @implementation VLCOpenGLES2VideoView
@synthesize voutDisplay = _voutDisplay, eaglContext = _eaglContext; @synthesize voutDisplay = _voutDisplay, eaglContext = _eaglContext, isAppActive = _appActive;
+ (Class)layerClass + (Class)layerClass
{ {
...@@ -384,6 +391,8 @@ static void OpenglESSwap(vlc_gl_t *gl) ...@@ -384,6 +391,8 @@ static void OpenglESSwap(vlc_gl_t *gl)
[self performSelectorOnMainThread:@selector(reshape) withObject:nil waitUntilDone:NO]; [self performSelectorOnMainThread:@selector(reshape) withObject:nil waitUntilDone:NO];
[self setAutoresizingMask: UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight]; [self setAutoresizingMask: UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
_appActive = ([UIApplication sharedApplication].applicationState == UIApplicationStateActive);
return self; return self;
} }
...@@ -484,6 +493,14 @@ static void OpenglESSwap(vlc_gl_t *gl) ...@@ -484,6 +493,14 @@ static void OpenglESSwap(vlc_gl_t *gl)
glViewport(place.x, place.y, place.width, place.height); glViewport(place.x, place.y, place.width, place.height);
} }
- (void)applicationStateChanged:(NSNotification *)notification
{
if ([[notification name] isEqualToString: UIApplicationWillResignActiveNotification])
_appActive = NO;
else
_appActive = YES;
}
- (void)updateConstraints - (void)updateConstraints
{ {
[self reshape]; [self reshape];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment