webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java - Issue 1304063011: Move shared EGL context initialization to a separate function.

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: webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

Issue 1304063011: Move shared EGL context initialization to a separate function. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Address comment + fix Linux build. Created 5 years, 4 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/src/org/webrtc/PeerConnectionFactory.java ('k') | webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

index 3073c34a9b7db5f57b89920df40dbe73a4b74cab..05187a6a3aed4ea6f751807d826f7c5aac05f7a3 100644

--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java

@@ -394,8 +394,7 @@ public class CallActivity extends Activity

Log.d(TAG, "Creating peer connection factory, delay=" + delta + "ms");

peerConnectionClient = PeerConnectionClient.getInstance();

peerConnectionClient.createPeerConnectionFactory(CallActivity.this,

- VideoRendererGui.getEGLContext(), peerConnectionParameters,

- CallActivity.this);

+ peerConnectionParameters, CallActivity.this);

}

if (signalingParameters != null) {

Log.w(TAG, "EGL context is ready after room connection.");

@@ -481,7 +480,7 @@ public class CallActivity extends Activity

return;

}

logAndToast("Creating peer connection, delay=" + delta + "ms");

- peerConnectionClient.createPeerConnection(

+ peerConnectionClient.createPeerConnection(VideoRendererGui.getEGLContext(),

localRender, remoteRender, signalingParameters);

if (signalingParameters.initiator) {