Index: webrtc/api/peerconnectioninterface.h |
diff --git a/webrtc/api/peerconnectioninterface.h b/webrtc/api/peerconnectioninterface.h |
index 22109c4088e9415f0f55015ee95b9747dea24b4d..9dcf8a703d51098cad87206cc76bc5e7b04576f5 100644 |
--- a/webrtc/api/peerconnectioninterface.h |
+++ b/webrtc/api/peerconnectioninterface.h |
@@ -70,6 +70,7 @@ |
#include "webrtc/base/rtccertificate.h" |
#include "webrtc/base/socketaddress.h" |
#include "webrtc/base/sslstreamadapter.h" |
+#include "webrtc/media/base/mediachannel.h" |
#include "webrtc/p2p/base/portallocator.h" |
namespace rtc { |
@@ -241,16 +242,13 @@ class PeerConnectionInterface : public rtc::RefCountInterface { |
int ice_backup_candidate_pair_ping_interval; // ms |
ContinualGatheringPolicy continual_gathering_policy; |
std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates; |
- bool disable_prerenderer_smoothing; |
bool prioritize_most_likely_ice_candidate_pairs; |
+ struct cricket::MediaConfig media_config; |
perkj_webrtc
2016/03/22 08:31:25
Doesn't this change break chrome and other clients
|
// Flags corresponding to values set by constraint flags. |
// rtc::Optional flags can be "missing", in which case the webrtc |
// default applies. |
bool disable_ipv6; |
- rtc::Optional<bool> enable_dscp; |
bool enable_rtp_data_channel; |
- rtc::Optional<bool> cpu_overuse_detection; |
- rtc::Optional<bool> suspend_below_min_bitrate; |
rtc::Optional<int> screencast_min_bitrate; |
rtc::Optional<bool> combined_audio_video_bwe; |
rtc::Optional<bool> enable_dtls_srtp; |
@@ -264,7 +262,6 @@ class PeerConnectionInterface : public rtc::RefCountInterface { |
ice_connection_receiving_timeout(kUndefined), |
ice_backup_candidate_pair_ping_interval(kUndefined), |
continual_gathering_policy(GATHER_ONCE), |
- disable_prerenderer_smoothing(false), |
prioritize_most_likely_ice_candidate_pairs(false), |
disable_ipv6(false), |
enable_rtp_data_channel(false) {} |