admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nil out EAGLContext explicitly on RTCEAGLVideoView dealloc.

Browse Source 
Theoretical fix to address some EAGLContext issues from other UIImageViews that could be active.

NOTRY=True
BUG=

Review-Url: https://codereview.webrtc.org/2259513002
Cr-Commit-Position: refs/heads/master@{#13806}
This commit is contained in:
tkchin 2016-08-17 16:02:58 -07:00 committed by Commit bot
parent 869dab775c
commit 41a3287472
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/sdk/objc/Framework/Classes/RTCEAGLVideoView.m
View File

@ -93,6 +93,7 @@
@implementation RTCEAGLVideoView {
RTCDisplayLinkTimer *_timer;
EAGLContext *_glContext;
// This flag should only be set and read on the main thread (e.g. by
// setNeedsDisplay)
BOOL _isDirty;
@ -123,11 +124,12 @@
if (!glContext) {
glContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
}
_glRenderer = [[RTCOpenGLVideoRenderer alloc] initWithContext:glContext];
_glContext = glContext;
_glRenderer = [[RTCOpenGLVideoRenderer alloc] initWithContext:_glContext];
// GLKView manages a framebuffer for us.
_glkView = [[GLKView alloc] initWithFrame:CGRectZero
context:glContext];
context:_glContext];
_glkView.drawableColorFormat = GLKViewDrawableColorFormatRGBA8888;
_glkView.drawableDepthFormat = GLKViewDrawableDepthFormatNone;
_glkView.drawableStencilFormat = GLKViewDrawableStencilFormatNone;
@ -169,6 +171,9 @@
[self teardownGL];
}
[_timer invalidate];
if (_glContext && [EAGLContext currentContext] == _glContext) {
[EAGLContext setCurrentContext:nil];
}
}
#pragma mark - UIView