zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose audio_jitter_buffer_fast_accelerate config to objc wrapper

Browse Source 
NOTRY=True
BUG=webrtc:6827

Review-Url: https://codereview.webrtc.org/2556553002
Cr-Commit-Position: refs/heads/master@{#15429}
This commit is contained in:
haysc
2016-12-05 14:24:32 -08:00
committed by Commit bot
parent 5fe4d496c0
commit c9f95005f2
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/sdk/objc/Framework/Classes/RTCConfiguration.mm
View File

@ -28,6 +28,7 @@
@synthesize candidateNetworkPolicy = _candidateNetworkPolicy; @synthesize candidateNetworkPolicy = _candidateNetworkPolicy;
@synthesize continualGatheringPolicy = _continualGatheringPolicy; @synthesize continualGatheringPolicy = _continualGatheringPolicy;
@synthesize audioJitterBufferMaxPackets = _audioJitterBufferMaxPackets; @synthesize audioJitterBufferMaxPackets = _audioJitterBufferMaxPackets;
@synthesize audioJitterBufferFastAccelerate = _audioJitterBufferFastAccelerate;
@synthesize iceConnectionReceivingTimeout = _iceConnectionReceivingTimeout; @synthesize iceConnectionReceivingTimeout = _iceConnectionReceivingTimeout;
@synthesize iceBackupCandidatePairPingInterval = @synthesize iceBackupCandidatePairPingInterval =
_iceBackupCandidatePairPingInterval; _iceBackupCandidatePairPingInterval;
@ -58,6 +59,7 @@
_continualGatheringPolicy = _continualGatheringPolicy =
[[self class] continualGatheringPolicyForNativePolicy:nativePolicy]; [[self class] continualGatheringPolicyForNativePolicy:nativePolicy];
_audioJitterBufferMaxPackets = config.audio_jitter_buffer_max_packets; _audioJitterBufferMaxPackets = config.audio_jitter_buffer_max_packets;
_audioJitterBufferFastAccelerate = config.audio_jitter_buffer_fast_accelerate;
_iceConnectionReceivingTimeout = config.ice_connection_receiving_timeout; _iceConnectionReceivingTimeout = config.ice_connection_receiving_timeout;
_iceBackupCandidatePairPingInterval = _iceBackupCandidatePairPingInterval =
config.ice_backup_candidate_pair_ping_interval; config.ice_backup_candidate_pair_ping_interval;
@ -72,7 +74,7 @@
- (NSString *)description { - (NSString *)description {
return [NSString stringWithFormat: 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, _iceServers,
[[self class] stringForTransportPolicy:_iceTransportPolicy], [[self class] stringForTransportPolicy:_iceTransportPolicy],
[[self class] stringForBundlePolicy:_bundlePolicy], [[self class] stringForBundlePolicy:_bundlePolicy],
@ -82,6 +84,7 @@
[[self class] [[self class]
stringForContinualGatheringPolicy:_continualGatheringPolicy], stringForContinualGatheringPolicy:_continualGatheringPolicy],
_audioJitterBufferMaxPackets, _audioJitterBufferMaxPackets,
_audioJitterBufferFastAccelerate,
_iceConnectionReceivingTimeout, _iceConnectionReceivingTimeout,
_iceBackupCandidatePairPingInterval, _iceBackupCandidatePairPingInterval,
_iceCandidatePoolSize, _iceCandidatePoolSize,
@ -113,6 +116,8 @@
nativeConfig->continual_gathering_policy = [[self class] nativeConfig->continual_gathering_policy = [[self class]
nativeContinualGatheringPolicyForPolicy:_continualGatheringPolicy]; nativeContinualGatheringPolicyForPolicy:_continualGatheringPolicy];
nativeConfig->audio_jitter_buffer_max_packets = _audioJitterBufferMaxPackets; nativeConfig->audio_jitter_buffer_max_packets = _audioJitterBufferMaxPackets;
nativeConfig->audio_jitter_buffer_fast_accelerate =
_audioJitterBufferFastAccelerate ? true : false;
nativeConfig->ice_connection_receiving_timeout = nativeConfig->ice_connection_receiving_timeout =
_iceConnectionReceivingTimeout; _iceConnectionReceivingTimeout;
nativeConfig->ice_backup_candidate_pair_ping_interval = nativeConfig->ice_backup_candidate_pair_ping_interval =

1
webrtc/sdk/objc/Framework/Headers/WebRTC/RTCConfiguration.h
View File

@ -84,6 +84,7 @@ RTC_EXPORT
@property(nonatomic, assign) @property(nonatomic, assign)
RTCContinualGatheringPolicy continualGatheringPolicy; RTCContinualGatheringPolicy continualGatheringPolicy;
@property(nonatomic, assign) int audioJitterBufferMaxPackets; @property(nonatomic, assign) int audioJitterBufferMaxPackets;
@property(nonatomic, assign) BOOL audioJitterBufferFastAccelerate;
@property(nonatomic, assign) int iceConnectionReceivingTimeout; @property(nonatomic, assign) int iceConnectionReceivingTimeout;
@property(nonatomic, assign) int iceBackupCandidatePairPingInterval; @property(nonatomic, assign) int iceBackupCandidatePairPingInterval;

2
webrtc/sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm
View File

@ -40,6 +40,7 @@
const int timeout = 1; const int timeout = 1;
const int interval = 2; const int interval = 2;
config.audioJitterBufferMaxPackets = maxPackets; config.audioJitterBufferMaxPackets = maxPackets;
config.audioJitterBufferFastAccelerate = YES;
config.iceConnectionReceivingTimeout = timeout; config.iceConnectionReceivingTimeout = timeout;
config.iceBackupCandidatePairPingInterval = interval; config.iceBackupCandidatePairPingInterval = interval;
config.continualGatheringPolicy = config.continualGatheringPolicy =
@ -65,6 +66,7 @@
EXPECT_EQ(webrtc::PeerConnectionInterface::kCandidateNetworkPolicyLowCost, EXPECT_EQ(webrtc::PeerConnectionInterface::kCandidateNetworkPolicyLowCost,
nativeConfig->candidate_network_policy); nativeConfig->candidate_network_policy);
EXPECT_EQ(maxPackets, nativeConfig->audio_jitter_buffer_max_packets); 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(timeout, nativeConfig->ice_connection_receiving_timeout);
EXPECT_EQ(interval, nativeConfig->ice_backup_candidate_pair_ping_interval); EXPECT_EQ(interval, nativeConfig->ice_backup_candidate_pair_ping_interval);
EXPECT_EQ(webrtc::PeerConnectionInterface::GATHER_CONTINUALLY, EXPECT_EQ(webrtc::PeerConnectionInterface::GATHER_CONTINUALLY,