generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up the Channel code in AppRTCDemo and use GAE prod server for new signaling mode.

Browse Source 
BUG=
R=tkchin@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/31299004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7955 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org
2014-12-18 20:12:03 +00:00
parent f5847d7746
commit 16a05dddb8
9 changed files with 5 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
View File

@@ -215,17 +215,11 @@ public class AppRTCDemoActivity extends Activity
runTimeMs = intent.getIntExtra(ConnectActivity.EXTRA_RUNTIME, 0);
startBitrate = intent.getIntExtra(ConnectActivity.EXTRA_BITRATE, 0);
hwCodec = intent.getBooleanExtra(ConnectActivity.EXTRA_HWCODEC, true);
boolean useWebsocket = intent.getBooleanExtra(
ConnectActivity.EXTRA_WEBSOCKET, false);
if (url != null) {
if (loopback || (roomName != null && !roomName.equals(""))) {
logAndToast(getString(R.string.connecting_to, url));
if (useWebsocket) {
appRtcClient = new WebSocketRTCClient(this);
} else {
appRtcClient = new GAERTCClient(this, this);
}
appRtcClient = new WebSocketRTCClient(this);
appRtcClient.connectToRoom(url.toString(), loopback);
if (loopback) {
roomNameView.setText("loopback");