Add new features to AppRTCDemo from private repo.
- Add HUD fragment with HUD related controls and more HUD statistics. - Create and set all peer connection constraints in PeerConnectionClient class. - Handle registration request in web socket class internally once web socket connection is opened. R=wzh@webrtc.org Review URL: https://webrtc-codereview.appspot.com/44669004 Cr-Commit-Position: refs/heads/master@{#8762} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8762 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -77,6 +77,7 @@ public class WebSocketRTCClient implements AppRTCClient,
|
||||
this.events = events;
|
||||
this.executor = executor;
|
||||
roomState = ConnectionState.NEW;
|
||||
executor.requestStart();
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
@@ -86,7 +87,6 @@ public class WebSocketRTCClient implements AppRTCClient,
|
||||
@Override
|
||||
public void connectToRoom(RoomConnectionParameters connectionParameters) {
|
||||
this.connectionParameters = connectionParameters;
|
||||
executor.requestStart();
|
||||
executor.execute(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
@@ -131,8 +131,7 @@ public class WebSocketRTCClient implements AppRTCClient,
|
||||
}
|
||||
};
|
||||
|
||||
new RoomParametersFetcher(connectionParameters.loopback, connectionUrl,
|
||||
null, callbacks).makeRequest();
|
||||
new RoomParametersFetcher(connectionUrl, null, callbacks).makeRequest();
|
||||
}
|
||||
|
||||
// Disconnect from room and send bye messages - runs on a local looper thread.
|
||||
@@ -193,9 +192,9 @@ public class WebSocketRTCClient implements AppRTCClient,
|
||||
// Fire connection and signaling parameters events.
|
||||
events.onConnectedToRoom(signalingParameters);
|
||||
|
||||
// Connect to WebSocket server.
|
||||
wsClient.connect(signalingParameters.wssUrl, signalingParameters.wssPostUrl,
|
||||
connectionParameters.roomId, signalingParameters.clientId);
|
||||
// Connect and register WebSocket client.
|
||||
wsClient.connect(signalingParameters.wssUrl, signalingParameters.wssPostUrl);
|
||||
wsClient.register(connectionParameters.roomId, signalingParameters.clientId);
|
||||
}
|
||||
|
||||
// Send local offer SDP to the other participant.
|
||||
@@ -274,12 +273,6 @@ public class WebSocketRTCClient implements AppRTCClient,
|
||||
// WebSocketChannelEvents interface implementation.
|
||||
// All events are called by WebSocketChannelClient on a local looper thread
|
||||
// (passed to WebSocket client constructor).
|
||||
@Override
|
||||
public void onWebSocketOpen() {
|
||||
Log.d(TAG, "Websocket connection completed. Registering...");
|
||||
wsClient.register();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onWebSocketMessage(final String msg) {
|
||||
if (wsClient.getState() != WebSocketConnectionState.REGISTERED) {
|
||||
|
||||
Reference in New Issue
Block a user