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

Unified Diff: content/renderer/media/peer_connection_tracker.cc

Issue 396193005: Converts RTCOfferOptions to constriants in the glue code for createOffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix sync Created 6 years, 5 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
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 b68fe09623ad26e2c4a3ce40b106a0fcb7b80334..dc9be528d2cebf540ab349d528dc4ac00ca320f1 100644
--- a/content/renderer/media/peer_connection_tracker.cc
+++ b/content/renderer/media/peer_connection_tracker.cc
@@ -121,6 +121,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; \
@@ -277,14 +299,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(
@@ -346,14 +371,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(
« no previous file with comments | « content/renderer/media/peer_connection_tracker.h ('k') | content/renderer/media/rtc_peer_connection_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698