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

Unified Diff: webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm

Issue 2979993003: Revert of iOS - Add iceRegatherIntervalRange. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « webrtc/sdk/BUILD.gn ('k') | webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
index 24fcdeff38f73b7fd7959480a3f9f961b01a504b..ad11b30f90c98dfbf5639878942117af257ec430 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCConfiguration.mm
@@ -13,7 +13,6 @@
#include <memory>
#import "RTCIceServer+Private.h"
-#import "RTCIntervalRange+Private.h"
#import "WebRTC/RTCLogging.h"
#include "webrtc/rtc_base/rtccertificategenerator.h"
@@ -39,7 +38,6 @@
@synthesize shouldPresumeWritableWhenFullyRelayed =
_shouldPresumeWritableWhenFullyRelayed;
@synthesize iceCheckMinInterval = _iceCheckMinInterval;
-@synthesize iceRegatherIntervalRange = _iceRegatherIntervalRange;
- (instancetype)init {
// Copy defaults.
@@ -85,18 +83,13 @@
_iceCheckMinInterval =
[NSNumber numberWithInt:*config.ice_check_min_interval];
}
- if (config.ice_regather_interval_range) {
- const rtc::IntervalRange &nativeIntervalRange = config.ice_regather_interval_range.value();
- _iceRegatherIntervalRange =
- [[RTCIntervalRange alloc] initWithNativeIntervalRange:nativeIntervalRange];
- }
}
return self;
}
- (NSString *)description {
return [NSString stringWithFormat:
- @"RTCConfiguration: {\n%@\n%@\n%@\n%@\n%@\n%@\n%@\n%d\n%d\n%d\n%d\n%d\n%d\n%d\n%@\n%@\n}\n",
+ @"RTCConfiguration: {\n%@\n%@\n%@\n%@\n%@\n%@\n%@\n%d\n%d\n%d\n%d\n%d\n%d\n%d\n%@\n}\n",
_iceServers,
[[self class] stringForTransportPolicy:_iceTransportPolicy],
[[self class] stringForBundlePolicy:_bundlePolicy],
@@ -112,8 +105,7 @@
_iceCandidatePoolSize,
_shouldPruneTurnPorts,
_shouldPresumeWritableWhenFullyRelayed,
- _iceCheckMinInterval,
- _iceRegatherIntervalRange];
+ _iceCheckMinInterval];
}
#pragma mark - Private
@@ -167,12 +159,6 @@
nativeConfig->ice_check_min_interval =
rtc::Optional<int>(_iceCheckMinInterval.intValue);
}
- if (_iceRegatherIntervalRange != nil) {
- std::unique_ptr<rtc::IntervalRange> nativeIntervalRange(
- _iceRegatherIntervalRange.nativeIntervalRange);
- nativeConfig->ice_regather_interval_range =
- rtc::Optional<rtc::IntervalRange>(*nativeIntervalRange);
- }
return nativeConfig.release();
}
« no previous file with comments | « webrtc/sdk/BUILD.gn ('k') | webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698