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

Android SurfaceViewRenderer: Fix eglBase null pointer exception

Browse Source 
Add null checks for eglBase, and detach the egl context in
SurfaceViewRenderer.surfaceDestroyed().

BUG=webrtc:6032
R=sakal@webrtc.org

Review URL: https://codereview.webrtc.org/2124983002 .

Cr-Commit-Position: refs/heads/master@{#13396}
This commit is contained in:
Magnus Jedvert 2016-07-06 16:16:09 +02:00
parent 8513029e1f
commit 44abcb5e41
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java
View File

@ -171,9 +171,10 @@ public class SurfaceViewRenderer extends SurfaceView
// |renderThreadHandler| is only created after |eglBase| is created in init(), so the
// following code will only execute if eglBase != null.
runOnRenderThread(new Runnable() {
@Override public void run() {
@Override
public void run() {
synchronized (layoutLock) {
if (isSurfaceCreated && !eglBase.hasSurface()) {
if (eglBase != null && isSurfaceCreated && !eglBase.hasSurface()) {
eglBase.createSurface(getHolder().getSurface());
eglBase.makeCurrent();
// Necessary for YUV frames with odd width.
@ -372,8 +373,12 @@ public class SurfaceViewRenderer extends SurfaceView
surfaceSize.y = 0;
}
runOnRenderThread(new Runnable() {
@Override public void run() {
eglBase.releaseSurface();
@Override
public void run() {
if (eglBase != null) {
eglBase.detachCurrent();
eglBase.releaseSurface();
}
}
});
}