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

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

Issue 2721163002: Add support for RTCConfiguration.iceCandidatePoolSize. (Closed)
Patch Set: Update layout test expectations. Created 3 years, 10 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 bfa8b6f20d8b794629783f1807a1d70dda8e63be..6e4cedfc7a2a5e56b06f3a1bf5395664542fc0fa 100644
--- a/content/renderer/media/peer_connection_tracker.cc
+++ b/content/renderer/media/peer_connection_tracker.cc
@@ -173,6 +173,18 @@ static const char* SerializeRtcpMuxPolicy(
return policy_str;
}
+static std::string SerializeConfiguration(
+ const webrtc::PeerConnectionInterface::RTCConfiguration& config) {
+ std::ostringstream oss;
+ oss << "{ iceServers: " << SerializeServers(config.servers) << ", "
+ << "iceTransportPolicy: " << SerializeIceTransportType(config.type)
+ << ", "
+ << "bundlePolicy: " << SerializeBundlePolicy(config.bundle_policy) << ", "
+ << "rtcpMuxPolicy: " << SerializeRtcpMuxPolicy(config.rtcp_mux_policy)
hbos_chromium 2017/03/03 11:56:06 I noticed there's no "certificates", even though c
Taylor_Brandstetter 2017/03/03 18:44:46 TODO added.
+ << "iceCandidatePoolSize: " << config.ice_candidate_pool_size << " }";
+ return oss.str();
+}
+
#define GET_STRING_OF_STATE(state) \
case WebRTCPeerConnectionHandlerClient::state: \
result = #state; \
@@ -428,11 +440,7 @@ void PeerConnectionTracker::RegisterPeerConnection(
PeerConnectionInfo info;
info.lid = GetNextLocalID();
- info.rtc_configuration =
- "{ iceServers: " + SerializeServers(config.servers) + ", " +
- "iceTransportPolicy: " + SerializeIceTransportType(config.type) + ", " +
- "bundlePolicy: " + SerializeBundlePolicy(config.bundle_policy) + ", " +
- "rtcpMuxPolicy: " + SerializeRtcpMuxPolicy(config.rtcp_mux_policy) + " }";
+ info.rtc_configuration = SerializeConfiguration(config);
info.constraints = SerializeMediaConstraints(constraints);
if (frame)
@@ -532,14 +540,8 @@ void PeerConnectionTracker::TrackSetConfiguration(
if (id == -1)
return;
- std::ostringstream result;
- result << "servers: " << SerializeServers(config.servers)
- << "iceTransportType: " << SerializeIceTransportType(config.type)
- << "bundlePolicy: " << SerializeBundlePolicy(config.bundle_policy)
- << "rtcpMuxPolicy: " << SerializeRtcpMuxPolicy(config.rtcp_mux_policy)
- << "}";
-
- SendPeerConnectionUpdate(id, "setConfiguration", result.str());
+ SendPeerConnectionUpdate(id, "setConfiguration",
+ SerializeConfiguration(config));
}
void PeerConnectionTracker::TrackAddIceCandidate(

Powered by Google App Engine
This is Rietveld 408576698