| Index: content/renderer/media/peer_connection_tracker.cc
|
| diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc
|
| index a9873971be8b39388c5d26ca837114d6bccf20c4..ff5b0133c8bc6320714ccabf73995bef213e3b4f 100644
|
| --- a/content/renderer/media/peer_connection_tracker.cc
|
| +++ b/content/renderer/media/peer_connection_tracker.cc
|
| @@ -98,6 +98,28 @@ static string SerializeMediaDescriptor(
|
| return result;
|
| }
|
|
|
| +static std::string SerializeIceTransportType(
|
| + webrtc::PeerConnectionInterface::IceTransportsType type) {
|
| + string transport_type;
|
| + switch (type) {
|
| + case webrtc::PeerConnectionInterface::kNone:
|
| + transport_type = "none";
|
| + break;
|
| + case webrtc::PeerConnectionInterface::kRelay:
|
| + transport_type = "relay";
|
| + break;
|
| + case webrtc::PeerConnectionInterface::kAll:
|
| + transport_type = "all";
|
| + break;
|
| + case webrtc::PeerConnectionInterface::kNoHost:
|
| + transport_type = "noHost";
|
| + break;
|
| + default:
|
| + NOTREACHED();
|
| + };
|
| + return transport_type;
|
| +}
|
| +
|
| #define GET_STRING_OF_STATE(state) \
|
| case WebRTCPeerConnectionHandlerClient::state: \
|
| result = #state; \
|
| @@ -254,14 +276,17 @@ void PeerConnectionTracker::OnGetAllStats() {
|
|
|
| void PeerConnectionTracker::RegisterPeerConnection(
|
| RTCPeerConnectionHandler* pc_handler,
|
| - const std::vector<webrtc::PeerConnectionInterface::IceServer>& servers,
|
| + const webrtc::PeerConnectionInterface::RTCConfiguration& config,
|
| const RTCMediaConstraints& constraints,
|
| const blink::WebFrame* frame) {
|
| DVLOG(1) << "PeerConnectionTracker::RegisterPeerConnection()";
|
| PeerConnectionInfo info;
|
|
|
| info.lid = GetNextLocalID();
|
| - info.servers = SerializeServers(servers);
|
| + info.rtc_configuration =
|
| + "{ servers: " + SerializeServers(config.servers) + ", " +
|
| + "iceTransportType: " + SerializeIceTransportType(config.type) + " }";
|
| +
|
| info.constraints = SerializeMediaConstraints(constraints);
|
| info.url = frame->document().url().spec();
|
| RenderThreadImpl::current()->Send(
|
| @@ -323,14 +348,20 @@ void PeerConnectionTracker::TrackSetSessionDescription(
|
|
|
| void PeerConnectionTracker::TrackUpdateIce(
|
| RTCPeerConnectionHandler* pc_handler,
|
| - const std::vector<webrtc::PeerConnectionInterface::IceServer>& servers,
|
| + const webrtc::PeerConnectionInterface::RTCConfiguration& config,
|
| const RTCMediaConstraints& options) {
|
| - string servers_string = "servers: " + SerializeServers(servers);
|
| + string servers_string = "servers: " + SerializeServers(config.servers);
|
| +
|
| + string transport_type =
|
| + "iceTransportType: " + SerializeIceTransportType(config.type);
|
| +
|
| string constraints =
|
| "constraints: {" + SerializeMediaConstraints(options) + "}";
|
|
|
| SendPeerConnectionUpdate(
|
| - pc_handler, "updateIce", servers_string + ", " + constraints);
|
| + pc_handler,
|
| + "updateIce",
|
| + servers_string + ", " + transport_type + ", " + constraints);
|
| }
|
|
|
| void PeerConnectionTracker::TrackAddIceCandidate(
|
|
|