mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00

This reverts commit 181ea6e414
.
Reason for revert: Breaks downstream project. Kári will help to land it next week.
Original change's description:
> Add a prefix for objc category.
>
> According to the Google Objective-C style [1], category names should
> start with an appropriate prefix. WebRTC has some category definitions
> for system interfaces, but it doesn't use prefixes.
>
> $ otool -ov WebRTC.framework/WebRTC | grep -E "^[0-9a-z]{16} 0x[0-9a-z]+ __OBJC_._CATEGORY" | grep -v "_RTC"
> 0000000002160840 0x217c3c0 __OBJC_$_CATEGORY_UIDevice_$_H264Profile
> 0000000002160850 0x21808b8 __OBJC_$_CATEGORY_AVCaptureSession_$_DevicePosition
> 0000000002160858 0x2180968 __OBJC_$_CATEGORY_NSString_$_StdString
> 0000000002160860 0x21809c8 __OBJC_$_CATEGORY_NSString_$_AbslStringView
>
> To avoid conflicts, prefix the names and methods of those categories.
> Also remove sdk/objc/Framework/Classes/Common/NSString+StdString.h as
> it is not used by any other files.
>
> [1] https://google.github.io/styleguide/objcguide.html#category-naming
>
> Bug: webrtc:13884
> Change-Id: I2cf2742af198ab4e0bfb15c0476d72971e50ceee
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262341
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36880}
Bug: webrtc:13884
Change-Id: I85257088e4a3a62e01ff925ab5e77af83b078ef3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262420
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36885}
162 lines
8 KiB
Text
162 lines
8 KiB
Text
/*
|
|
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import <Foundation/Foundation.h>
|
|
#import <XCTest/XCTest.h>
|
|
|
|
#include <vector>
|
|
|
|
#include "rtc_base/gunit.h"
|
|
|
|
#import "api/peerconnection/RTCConfiguration+Private.h"
|
|
#import "api/peerconnection/RTCConfiguration.h"
|
|
#import "api/peerconnection/RTCIceServer.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@interface RTCConfigurationTest : XCTestCase
|
|
@end
|
|
|
|
@implementation RTCConfigurationTest
|
|
|
|
- (void)testConversionToNativeConfiguration {
|
|
NSArray *urlStrings = @[ @"stun:stun1.example.net" ];
|
|
RTC_OBJC_TYPE(RTCIceServer) *server =
|
|
[[RTC_OBJC_TYPE(RTCIceServer) alloc] initWithURLStrings:urlStrings];
|
|
|
|
RTC_OBJC_TYPE(RTCConfiguration) *config = [[RTC_OBJC_TYPE(RTCConfiguration) alloc] init];
|
|
config.iceServers = @[ server ];
|
|
config.iceTransportPolicy = RTCIceTransportPolicyRelay;
|
|
config.bundlePolicy = RTCBundlePolicyMaxBundle;
|
|
config.rtcpMuxPolicy = RTCRtcpMuxPolicyNegotiate;
|
|
config.tcpCandidatePolicy = RTCTcpCandidatePolicyDisabled;
|
|
config.candidateNetworkPolicy = RTCCandidateNetworkPolicyLowCost;
|
|
const int maxPackets = 60;
|
|
const int timeout = 1;
|
|
const int interval = 2;
|
|
config.audioJitterBufferMaxPackets = maxPackets;
|
|
config.audioJitterBufferFastAccelerate = YES;
|
|
config.iceConnectionReceivingTimeout = timeout;
|
|
config.iceBackupCandidatePairPingInterval = interval;
|
|
config.continualGatheringPolicy =
|
|
RTCContinualGatheringPolicyGatherContinually;
|
|
config.shouldPruneTurnPorts = YES;
|
|
config.cryptoOptions =
|
|
[[RTC_OBJC_TYPE(RTCCryptoOptions) alloc] initWithSrtpEnableGcmCryptoSuites:YES
|
|
srtpEnableAes128Sha1_32CryptoCipher:YES
|
|
srtpEnableEncryptedRtpHeaderExtensions:YES
|
|
sframeRequireFrameEncryption:YES];
|
|
config.rtcpAudioReportIntervalMs = 2500;
|
|
config.rtcpVideoReportIntervalMs = 3750;
|
|
|
|
std::unique_ptr<webrtc::PeerConnectionInterface::RTCConfiguration>
|
|
nativeConfig([config createNativeConfiguration]);
|
|
EXPECT_TRUE(nativeConfig.get());
|
|
EXPECT_EQ(1u, nativeConfig->servers.size());
|
|
webrtc::PeerConnectionInterface::IceServer nativeServer =
|
|
nativeConfig->servers.front();
|
|
EXPECT_EQ(1u, nativeServer.urls.size());
|
|
EXPECT_EQ("stun:stun1.example.net", nativeServer.urls.front());
|
|
|
|
EXPECT_EQ(webrtc::PeerConnectionInterface::kRelay, nativeConfig->type);
|
|
EXPECT_EQ(webrtc::PeerConnectionInterface::kBundlePolicyMaxBundle,
|
|
nativeConfig->bundle_policy);
|
|
EXPECT_EQ(webrtc::PeerConnectionInterface::kRtcpMuxPolicyNegotiate,
|
|
nativeConfig->rtcp_mux_policy);
|
|
EXPECT_EQ(webrtc::PeerConnectionInterface::kTcpCandidatePolicyDisabled,
|
|
nativeConfig->tcp_candidate_policy);
|
|
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,
|
|
nativeConfig->continual_gathering_policy);
|
|
EXPECT_EQ(true, nativeConfig->prune_turn_ports);
|
|
EXPECT_EQ(true, nativeConfig->crypto_options->srtp.enable_gcm_crypto_suites);
|
|
EXPECT_EQ(true, nativeConfig->crypto_options->srtp.enable_aes128_sha1_32_crypto_cipher);
|
|
EXPECT_EQ(true, nativeConfig->crypto_options->srtp.enable_encrypted_rtp_header_extensions);
|
|
EXPECT_EQ(true, nativeConfig->crypto_options->sframe.require_frame_encryption);
|
|
EXPECT_EQ(2500, nativeConfig->audio_rtcp_report_interval_ms());
|
|
EXPECT_EQ(3750, nativeConfig->video_rtcp_report_interval_ms());
|
|
}
|
|
|
|
- (void)testNativeConversionToConfiguration {
|
|
NSArray *urlStrings = @[ @"stun:stun1.example.net" ];
|
|
RTC_OBJC_TYPE(RTCIceServer) *server =
|
|
[[RTC_OBJC_TYPE(RTCIceServer) alloc] initWithURLStrings:urlStrings];
|
|
|
|
RTC_OBJC_TYPE(RTCConfiguration) *config = [[RTC_OBJC_TYPE(RTCConfiguration) alloc] init];
|
|
config.iceServers = @[ server ];
|
|
config.iceTransportPolicy = RTCIceTransportPolicyRelay;
|
|
config.bundlePolicy = RTCBundlePolicyMaxBundle;
|
|
config.rtcpMuxPolicy = RTCRtcpMuxPolicyNegotiate;
|
|
config.tcpCandidatePolicy = RTCTcpCandidatePolicyDisabled;
|
|
config.candidateNetworkPolicy = RTCCandidateNetworkPolicyLowCost;
|
|
const int maxPackets = 60;
|
|
const int timeout = 1;
|
|
const int interval = 2;
|
|
config.audioJitterBufferMaxPackets = maxPackets;
|
|
config.audioJitterBufferFastAccelerate = YES;
|
|
config.iceConnectionReceivingTimeout = timeout;
|
|
config.iceBackupCandidatePairPingInterval = interval;
|
|
config.continualGatheringPolicy =
|
|
RTCContinualGatheringPolicyGatherContinually;
|
|
config.shouldPruneTurnPorts = YES;
|
|
config.cryptoOptions =
|
|
[[RTC_OBJC_TYPE(RTCCryptoOptions) alloc] initWithSrtpEnableGcmCryptoSuites:YES
|
|
srtpEnableAes128Sha1_32CryptoCipher:NO
|
|
srtpEnableEncryptedRtpHeaderExtensions:NO
|
|
sframeRequireFrameEncryption:NO];
|
|
config.rtcpAudioReportIntervalMs = 1500;
|
|
config.rtcpVideoReportIntervalMs = 2150;
|
|
|
|
webrtc::PeerConnectionInterface::RTCConfiguration *nativeConfig =
|
|
[config createNativeConfiguration];
|
|
RTC_OBJC_TYPE(RTCConfiguration) *newConfig =
|
|
[[RTC_OBJC_TYPE(RTCConfiguration) alloc] initWithNativeConfiguration:*nativeConfig];
|
|
EXPECT_EQ([config.iceServers count], newConfig.iceServers.count);
|
|
RTC_OBJC_TYPE(RTCIceServer) *newServer = newConfig.iceServers[0];
|
|
RTC_OBJC_TYPE(RTCIceServer) *origServer = config.iceServers[0];
|
|
EXPECT_EQ(origServer.urlStrings.count, server.urlStrings.count);
|
|
std::string origUrl = origServer.urlStrings.firstObject.UTF8String;
|
|
std::string url = newServer.urlStrings.firstObject.UTF8String;
|
|
EXPECT_EQ(origUrl, url);
|
|
|
|
EXPECT_EQ(config.iceTransportPolicy, newConfig.iceTransportPolicy);
|
|
EXPECT_EQ(config.bundlePolicy, newConfig.bundlePolicy);
|
|
EXPECT_EQ(config.rtcpMuxPolicy, newConfig.rtcpMuxPolicy);
|
|
EXPECT_EQ(config.tcpCandidatePolicy, newConfig.tcpCandidatePolicy);
|
|
EXPECT_EQ(config.candidateNetworkPolicy, newConfig.candidateNetworkPolicy);
|
|
EXPECT_EQ(config.audioJitterBufferMaxPackets, newConfig.audioJitterBufferMaxPackets);
|
|
EXPECT_EQ(config.audioJitterBufferFastAccelerate, newConfig.audioJitterBufferFastAccelerate);
|
|
EXPECT_EQ(config.iceConnectionReceivingTimeout, newConfig.iceConnectionReceivingTimeout);
|
|
EXPECT_EQ(config.iceBackupCandidatePairPingInterval,
|
|
newConfig.iceBackupCandidatePairPingInterval);
|
|
EXPECT_EQ(config.continualGatheringPolicy, newConfig.continualGatheringPolicy);
|
|
EXPECT_EQ(config.shouldPruneTurnPorts, newConfig.shouldPruneTurnPorts);
|
|
EXPECT_EQ(config.cryptoOptions.srtpEnableGcmCryptoSuites,
|
|
newConfig.cryptoOptions.srtpEnableGcmCryptoSuites);
|
|
EXPECT_EQ(config.cryptoOptions.srtpEnableAes128Sha1_32CryptoCipher,
|
|
newConfig.cryptoOptions.srtpEnableAes128Sha1_32CryptoCipher);
|
|
EXPECT_EQ(config.cryptoOptions.srtpEnableEncryptedRtpHeaderExtensions,
|
|
newConfig.cryptoOptions.srtpEnableEncryptedRtpHeaderExtensions);
|
|
EXPECT_EQ(config.cryptoOptions.sframeRequireFrameEncryption,
|
|
newConfig.cryptoOptions.sframeRequireFrameEncryption);
|
|
EXPECT_EQ(config.rtcpAudioReportIntervalMs, newConfig.rtcpAudioReportIntervalMs);
|
|
EXPECT_EQ(config.rtcpVideoReportIntervalMs, newConfig.rtcpVideoReportIntervalMs);
|
|
}
|
|
|
|
- (void)testDefaultValues {
|
|
RTC_OBJC_TYPE(RTCConfiguration) *config = [[RTC_OBJC_TYPE(RTCConfiguration) alloc] init];
|
|
EXPECT_EQ(config.cryptoOptions, nil);
|
|
}
|
|
|
|
@end
|