| 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 2075cdd00420e0abc7665b0f90ad5c72dfb309d2..f98c4eab3bbd9ff84266ff14b9bf5bdb8013ba6c 100644
|
| --- a/content/renderer/media/peer_connection_tracker.cc
|
| +++ b/content/renderer/media/peer_connection_tracker.cc
|
| @@ -145,6 +145,25 @@ static std::string SerializeIceTransportType(
|
| return transport_type;
|
| }
|
|
|
| +static std::string SerializeBundlePolicy(
|
| + webrtc::PeerConnectionInterface::BundlePolicy policy) {
|
| + string policy_str;
|
| + switch (policy) {
|
| + case webrtc::PeerConnectionInterface::kBundlePolicyBalanced:
|
| + policy_str = "balanced";
|
| + break;
|
| + case webrtc::PeerConnectionInterface::kBundlePolicyMaxBundle:
|
| + policy_str = "max-bundle";
|
| + break;
|
| + case webrtc::PeerConnectionInterface::kBundlePolicyMaxCompat:
|
| + policy_str = "max-compat";
|
| + break;
|
| + default:
|
| + NOTREACHED();
|
| + };
|
| + return policy_str;
|
| +}
|
| +
|
| #define GET_STRING_OF_STATE(state) \
|
| case WebRTCPeerConnectionHandlerClient::state: \
|
| result = #state; \
|
| @@ -339,7 +358,8 @@ void PeerConnectionTracker::RegisterPeerConnection(
|
| info.lid = GetNextLocalID();
|
| info.rtc_configuration =
|
| "{ servers: " + SerializeServers(config.servers) + ", " +
|
| - "iceTransportType: " + SerializeIceTransportType(config.type) + " }";
|
| + "iceTransportType: " + SerializeIceTransportType(config.type) + ", " +
|
| + "bundlePolicy: " + SerializeBundlePolicy(config.bundle_policy) + " }";
|
|
|
| info.constraints = SerializeMediaConstraints(constraints);
|
| info.url = frame->document().url().spec();
|
| @@ -410,13 +430,17 @@ void PeerConnectionTracker::TrackUpdateIce(
|
| string transport_type =
|
| "iceTransportType: " + SerializeIceTransportType(config.type);
|
|
|
| + string bundle_policy =
|
| + "bundlePolicy: " + SerializeBundlePolicy(config.bundle_policy);
|
| +
|
| string constraints =
|
| "constraints: {" + SerializeMediaConstraints(options) + "}";
|
|
|
| SendPeerConnectionUpdate(
|
| pc_handler,
|
| "updateIce",
|
| - servers_string + ", " + transport_type + ", " + constraints);
|
| + servers_string + ", " + transport_type + ", " +
|
| + bundle_policy + ", " + constraints);
|
| }
|
|
|
| void PeerConnectionTracker::TrackAddIceCandidate(
|
|
|