talk/app/webrtc/java/android/org/webrtc/EglBase10.java - Issue 1615153002: Change PeerConnectionFactory.setVideoHwAccelerationOptions to create shared Egl context for harware…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/app/webrtc/java/android/org/webrtc/EglBase10.java

Issue 1615153002: Change PeerConnectionFactory.setVideoHwAccelerationOptions to create shared Egl context for harware… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Added eglbase_jni to avoid code duplication. Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « talk/app/webrtc/java/android/org/webrtc/EglBase.java ('k') | talk/app/webrtc/java/android/org/webrtc/EglBase14.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: talk/app/webrtc/java/android/org/webrtc/EglBase10.java

diff --git a/talk/app/webrtc/java/android/org/webrtc/EglBase10.java b/talk/app/webrtc/java/android/org/webrtc/EglBase10.java

index f2aa9857faf09e223f40c610ab816d3f8969f84c..d11292d58e1f8ca28ff9074da3f99f1005176753 100644

--- a/talk/app/webrtc/java/android/org/webrtc/EglBase10.java

+++ b/talk/app/webrtc/java/android/org/webrtc/EglBase10.java

@@ -286,6 +286,9 @@ final class EglBase10 extends EglBase {

// Return an EGLConfig, or die trying.

private EGLContext createEglContext(

Context sharedContext, EGLDisplay eglDisplay, EGLConfig eglConfig) {

+ if (sharedContext != null && sharedContext.eglContext == EGL10.EGL_NO_CONTEXT) {

+ throw new RuntimeException("Invalid sharedContext");

+ }

int[] contextAttributes = {EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE};

EGLContext rootContext =

sharedContext == null ? EGL10.EGL_NO_CONTEXT : sharedContext.eglContext;

« no previous file with comments | « talk/app/webrtc/java/android/org/webrtc/EglBase.java ('k') | talk/app/webrtc/java/android/org/webrtc/EglBase14.java » ('j') | no next file with comments »