From c9f95005f249c03b826c6f5b324607d68a1b70d9 Mon Sep 17 00:00:00 2001 From: haysc Date: Mon, 5 Dec 2016 14:24:32 -0800 Subject: [PATCH] Expose audio_jitter_buffer_fast_accelerate config to objc wrapper NOTRY=True BUG=webrtc:6827 Review-Url: https://codereview.webrtc.org/2556553002 Cr-Commit-Position: refs/heads/master@{#15429} --- webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm | 7 ++++++- .../sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h | 1 + .../sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm b/webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm index 4bd666c32e..bf602d7da7 100644 --- a/webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm +++ b/webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm @@ -28,6 +28,7 @@ @synthesize candidateNetworkPolicy = _candidateNetworkPolicy; @synthesize continualGatheringPolicy = _continualGatheringPolicy; @synthesize audioJitterBufferMaxPackets = _audioJitterBufferMaxPackets; +@synthesize audioJitterBufferFastAccelerate = _audioJitterBufferFastAccelerate; @synthesize iceConnectionReceivingTimeout = _iceConnectionReceivingTimeout; @synthesize iceBackupCandidatePairPingInterval = _iceBackupCandidatePairPingInterval; @@ -58,6 +59,7 @@ _continualGatheringPolicy = [[self class] continualGatheringPolicyForNativePolicy:nativePolicy]; _audioJitterBufferMaxPackets = config.audio_jitter_buffer_max_packets; + _audioJitterBufferFastAccelerate = config.audio_jitter_buffer_fast_accelerate; _iceConnectionReceivingTimeout = config.ice_connection_receiving_timeout; _iceBackupCandidatePairPingInterval = config.ice_backup_candidate_pair_ping_interval; @@ -72,7 +74,7 @@ - (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}\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", _iceServers, [[self class] stringForTransportPolicy:_iceTransportPolicy], [[self class] stringForBundlePolicy:_bundlePolicy], @@ -82,6 +84,7 @@ [[self class] stringForContinualGatheringPolicy:_continualGatheringPolicy], _audioJitterBufferMaxPackets, + _audioJitterBufferFastAccelerate, _iceConnectionReceivingTimeout, _iceBackupCandidatePairPingInterval, _iceCandidatePoolSize, @@ -113,6 +116,8 @@ nativeConfig->continual_gathering_policy = [[self class] nativeContinualGatheringPolicyForPolicy:_continualGatheringPolicy]; nativeConfig->audio_jitter_buffer_max_packets = _audioJitterBufferMaxPackets; + nativeConfig->audio_jitter_buffer_fast_accelerate = + _audioJitterBufferFastAccelerate ? true : false; nativeConfig->ice_connection_receiving_timeout = _iceConnectionReceivingTimeout; nativeConfig->ice_backup_candidate_pair_ping_interval = diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h index a5107763ea..b7290804bc 100644 --- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h +++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h @@ -84,6 +84,7 @@ RTC_EXPORT @property(nonatomic, assign) RTCContinualGatheringPolicy continualGatheringPolicy; @property(nonatomic, assign) int audioJitterBufferMaxPackets; +@property(nonatomic, assign) BOOL audioJitterBufferFastAccelerate; @property(nonatomic, assign) int iceConnectionReceivingTimeout; @property(nonatomic, assign) int iceBackupCandidatePairPingInterval; diff --git a/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm b/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm index 1fca960586..79ffd17289 100644 --- a/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm +++ b/webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm @@ -40,6 +40,7 @@ const int timeout = 1; const int interval = 2; config.audioJitterBufferMaxPackets = maxPackets; + config.audioJitterBufferFastAccelerate = YES; config.iceConnectionReceivingTimeout = timeout; config.iceBackupCandidatePairPingInterval = interval; config.continualGatheringPolicy = @@ -65,6 +66,7 @@ EXPECT_EQ(webrtc::PeerConnectionInterface::kCandidateNetworkPolicyLowCost, nativeConfig->candidate_network_policy); EXPECT_EQ(maxPackets, nativeConfig->audio_jitter_buffer_max_packets); + EXPECT_EQ(true, nativeConfig->audio_jitter_buffer_fast_accelerate); EXPECT_EQ(timeout, nativeConfig->ice_connection_receiving_timeout); EXPECT_EQ(interval, nativeConfig->ice_backup_candidate_pair_ping_interval); EXPECT_EQ(webrtc::PeerConnectionInterface::GATHER_CONTINUALLY,