From fd630a50d23f0c2be2517a354be5456374d20689 Mon Sep 17 00:00:00 2001 From: "pthatcher@webrtc.org" Date: Wed, 14 Jan 2015 23:19:06 +0000 Subject: [PATCH] Add BundlePolicy to RTCConfiguration. Don't change any behavior. Just make it possible to make progress in Chromium while we work on the behavior. R=decurtis@webrtc.org, juberti@webrtc.org Review URL: https://webrtc-codereview.appspot.com/35759004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8067 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/peerconnectioninterface.h | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/talk/app/webrtc/peerconnectioninterface.h b/talk/app/webrtc/peerconnectioninterface.h index d61d2043e6..81a3ce78ab 100644 --- a/talk/app/webrtc/peerconnectioninterface.h +++ b/talk/app/webrtc/peerconnectioninterface.h @@ -180,18 +180,31 @@ class PeerConnectionInterface : public rtc::RefCountInterface { typedef std::vector IceServers; enum IceTransportsType { + // TODO(pthatcher): Rename these kTransporTypeXXX, but update + // Chromium at the same time. kNone, kRelay, kNoHost, kAll }; - struct RTCConfiguration { - IceTransportsType type; - IceServers servers; + // https://tools.ietf.org/html/draft-ietf-rtcweb-jsep-08#section-4.1.1 + enum BundlePolicy { + kBundlePolicyBalanced, + kBundlePolicyMaxBundle, + kBundlePolicyMaxCompat + }; - RTCConfiguration() : type(kAll) {} - explicit RTCConfiguration(IceTransportsType type) : type(type) {} + struct RTCConfiguration { + // TODO(pthatcher): Rename this ice_transport_type, but update + // Chromium at the same time. + IceTransportsType type; + // TODO(pthatcher): Rename this ice_servers, but update Chromium + // at the same time. + IceServers servers; + BundlePolicy bundle_policy; + + RTCConfiguration() : type(kAll), bundle_policy(kBundlePolicyBalanced) {} }; struct RTCOfferAnswerOptions {