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

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

Issue 1989013003: Add test for DirectRTCClient in AppRTC Demo for Android (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false)); 238 intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false));
239 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); 239 commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false);
240 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); 240 runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0);
241 241
242 // Create connection client. Use DirectRTCClient if room name is an IP other wise use the 242 // Create connection client. Use DirectRTCClient if room name is an IP other wise use the
243 // standard WebSocketRTCClient. 243 // standard WebSocketRTCClient.
244 if (loopback || !DirectRTCClient.IP_PATTERN.matcher(roomId).matches()) { 244 if (loopback || !DirectRTCClient.IP_PATTERN.matcher(roomId).matches()) {
245 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor()); 245 appRtcClient = new WebSocketRTCClient(this, new LooperExecutor());
246 } else { 246 } else {
247 Log.i(TAG, "Using DirectRTCClient because room name looks like an IP."); 247 Log.i(TAG, "Using DirectRTCClient because room name looks like an IP.");
248 appRtcClient = new DirectRTCClient(this); 248 appRtcClient = new DirectRTCClient(this, new LooperExecutor());
249 } 249 }
250 // Create connection parameters. 250 // Create connection parameters.
251 roomConnectionParameters = new RoomConnectionParameters( 251 roomConnectionParameters = new RoomConnectionParameters(
252 roomUri.toString(), roomId, loopback); 252 roomUri.toString(), roomId, loopback);
253 253
254 // Create CPU monitor 254 // Create CPU monitor
255 cpuMonitor = new CpuMonitor(this); 255 cpuMonitor = new CpuMonitor(this);
256 hudFragment.setCpuMonitor(cpuMonitor); 256 hudFragment.setCpuMonitor(cpuMonitor);
257 257
258 // Send intent arguments to fragments. 258 // Send intent arguments to fragments.
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 } 708 }
709 } 709 }
710 }); 710 });
711 } 711 }
712 712
713 @Override 713 @Override
714 public void onPeerConnectionError(final String description) { 714 public void onPeerConnectionError(final String description) {
715 reportError(description); 715 reportError(description);
716 } 716 }
717 } 717 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698