webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java - Issue 2741743002: IdlingResource for destroy() VideoFileRenderer

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 2741743002: IdlingResource for destroy() VideoFileRenderer (Closed)

Patch Set: Removal of counting resource Created 3 years, 9 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 | « webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java ('k') | webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.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 0197bcb3227dbc0fa0f290ab334199a4efa243ca..d1479f2a30043b764cdaf1bc8d8a7374bb84a0aa 100644

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

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

@@ -81,6 +81,7 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven

}

public static final String EXTRA_ROOMID = "org.appspot.apprtc.ROOMID";

+ public static final String EXTRA_COLLIDERURL = "org.appspot.apprtc.COLLIDERURL";

public static final String EXTRA_LOOPBACK = "org.appspot.apprtc.LOOPBACK";

public static final String EXTRA_VIDEO_CALL = "org.appspot.apprtc.VIDEO_CALL";

public static final String EXTRA_SCREENCAPTURE = "org.appspot.apprtc.SCREENCAPTURE";

@@ -337,7 +338,9 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven

appRtcClient = new DirectRTCClient(this);

}

// Create connection parameters.

- roomConnectionParameters = new RoomConnectionParameters(roomUri.toString(), roomId, loopback);

+ String colliderUrl = intent.getStringExtra(EXTRA_COLLIDERURL);

+ roomConnectionParameters =

+ new RoomConnectionParameters(roomUri.toString(), roomId, loopback, colliderUrl);

// Create CPU monitor

cpuMonitor = new CpuMonitor(this);