Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

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

Issue 1522073002: Revert of Made EglBase an abstract class and cleaned up. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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/libjingle.gyp ('k') | webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 b9abf11eb387f25d09021bd31c980c2f1b2aafc6..fdcfa29a6c2990a72feabf08fea05d738323ffb6 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
@@ -181,9 +181,9 @@
remoteRender.setOnClickListener(listener);
// Create video renderers.
- rootEglBase = EglBase.create();
- localRender.init(rootEglBase.getEglBaseContext(), null);
- remoteRender.init(rootEglBase.getEglBaseContext(), null);
+ rootEglBase = new EglBase();
+ localRender.init(rootEglBase.getContext(), null);
+ remoteRender.init(rootEglBase.getContext(), null);
localRender.setZOrderMediaOverlay(true);
updateVideoView();
@@ -254,7 +254,6 @@
// For command line execution run connection for <runTimeMs> and exit.
if (commandLineRun && runTimeMs > 0) {
(new Handler()).postDelayed(new Runnable() {
- @Override
public void run() {
disconnect();
}
@@ -489,7 +488,7 @@
signalingParameters = params;
logAndToast("Creating peer connection, delay=" + delta + "ms");
- peerConnectionClient.createPeerConnection(rootEglBase.getEglBaseContext(),
+ peerConnectionClient.createPeerConnection(rootEglBase.getContext(),
localRender, remoteRender, signalingParameters);
if (signalingParameters.initiator) {
« no previous file with comments | « talk/libjingle.gyp ('k') | webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698