diff --git a/AUTHORS b/AUTHORS index 212c990918..6c6a0cd017 100644 --- a/AUTHORS +++ b/AUTHORS @@ -35,6 +35,7 @@ CZ Theng Danail Kirov Dave Cowart David Porter +David Sanders Dax Booysen Dennis Angelo Dharmesh Chauhan diff --git a/examples/unityplugin/README b/examples/unityplugin/README index 5f26b89488..da8f07aa11 100644 --- a/examples/unityplugin/README +++ b/examples/unityplugin/README @@ -124,13 +124,13 @@ namespace SimplePeerConnectionM { LocalSdpReadytoSendInternalDelegate callback); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - private delegate void IceCandiateReadytoSendInternalDelegate( + private delegate void IceCandidateReadytoSendInternalDelegate( string candidate, int sdpMlineIndex, string sdpMid); - public delegate void IceCandiateReadytoSendDelegate( + public delegate void IceCandidateReadytoSendDelegate( int id, string candidate, int sdpMlineIndex, string sdpMid); [DllImport(dllPath, CallingConvention = CallingConvention.Cdecl)] - private static extern bool RegisterOnIceCandiateReadytoSend( - int peerConnectionId, IceCandiateReadytoSendInternalDelegate callback); + private static extern bool RegisterOnIceCandidateReadytoSend( + int peerConnectionId, IceCandidateReadytoSendInternalDelegate callback); [DllImport(dllPath, CallingConvention = CallingConvention.Cdecl)] private static extern bool SetRemoteDescription(int peerConnectionId, string type, string sdp); @@ -215,10 +215,10 @@ namespace SimplePeerConnectionM { RaiseLocalSdpReadytoSend); RegisterOnLocalSdpReadytoSend(mPeerConnectionId, localSdpReadytoSendDelegate); - iceCandiateReadytoSendDelegate = - new IceCandiateReadytoSendInternalDelegate(RaiseIceCandiateReadytoSend); - RegisterOnIceCandiateReadytoSend( - mPeerConnectionId, iceCandiateReadytoSendDelegate); + iceCandidateReadytoSendDelegate = + new IceCandidateReadytoSendInternalDelegate(RaiseIceCandidateReadytoSend); + RegisterOnIceCandidateReadytoSend( + mPeerConnectionId, iceCandidateReadytoSendDelegate); } private void RaiseLocalDataChannelReady() { @@ -267,9 +267,9 @@ namespace SimplePeerConnectionM { OnLocalSdpReadytoSend(mPeerConnectionId, type, sdp); } - private void RaiseIceCandiateReadytoSend(string candidate, int sdpMlineIndex, string sdpMid) { - if (OnIceCandiateReadytoSend != null) - OnIceCandiateReadytoSend(mPeerConnectionId, candidate, sdpMlineIndex, sdpMid); + private void RaiseIceCandidateReadytoSend(string candidate, int sdpMlineIndex, string sdpMid) { + if (OnIceCandidateReadytoSend != null) + OnIceCandidateReadytoSend(mPeerConnectionId, candidate, sdpMlineIndex, sdpMid); } public void AddQueuedIceCandidate(List iceCandidateQueue) { @@ -301,8 +301,8 @@ namespace SimplePeerConnectionM { private LocalSdpReadytoSendInternalDelegate localSdpReadytoSendDelegate = null; public event LocalSdpReadytoSendDelegate OnLocalSdpReadytoSend; - private IceCandiateReadytoSendInternalDelegate iceCandiateReadytoSendDelegate = null; - public event IceCandiateReadytoSendDelegate OnIceCandiateReadytoSend; + private IceCandidateReadytoSendInternalDelegate iceCandidateReadytoSendDelegate = null; + public event IceCandidateReadytoSendDelegate OnIceCandidateReadytoSend; private int mPeerConnectionId = -1; } diff --git a/examples/unityplugin/simple_peer_connection.cc b/examples/unityplugin/simple_peer_connection.cc index 16c580e767..90bbef7c16 100644 --- a/examples/unityplugin/simple_peer_connection.cc +++ b/examples/unityplugin/simple_peer_connection.cc @@ -286,9 +286,9 @@ void SimplePeerConnection::OnIceCandidate( return; } - if (OnIceCandiateReady) - OnIceCandiateReady(sdp.c_str(), candidate->sdp_mline_index(), - candidate->sdp_mid().c_str()); + if (OnIceCandidateReady) + OnIceCandidateReady(sdp.c_str(), candidate->sdp_mline_index(), + candidate->sdp_mid().c_str()); } void SimplePeerConnection::RegisterOnLocalI420FrameReady( @@ -327,9 +327,9 @@ void SimplePeerConnection::RegisterOnLocalSdpReadytoSend( OnLocalSdpReady = callback; } -void SimplePeerConnection::RegisterOnIceCandiateReadytoSend( +void SimplePeerConnection::RegisterOnIceCandidateReadytoSend( ICECANDIDATEREADYTOSEND_CALLBACK callback) { - OnIceCandiateReady = callback; + OnIceCandidateReady = callback; } bool SimplePeerConnection::SetRemoteDescription(const char* type, diff --git a/examples/unityplugin/simple_peer_connection.h b/examples/unityplugin/simple_peer_connection.h index d5cebc9940..5d681dc4ca 100644 --- a/examples/unityplugin/simple_peer_connection.h +++ b/examples/unityplugin/simple_peer_connection.h @@ -52,7 +52,7 @@ class SimplePeerConnection : public webrtc::PeerConnectionObserver, void RegisterOnFailure(FAILURE_CALLBACK callback); void RegisterOnAudioBusReady(AUDIOBUSREADY_CALLBACK callback); void RegisterOnLocalSdpReadytoSend(LOCALSDPREADYTOSEND_CALLBACK callback); - void RegisterOnIceCandiateReadytoSend( + void RegisterOnIceCandidateReadytoSend( ICECANDIDATEREADYTOSEND_CALLBACK callback); bool SetRemoteDescription(const char* type, const char* sdp); bool AddIceCandidate(const char* sdp, @@ -121,7 +121,7 @@ class SimplePeerConnection : public webrtc::PeerConnectionObserver, AUDIOBUSREADY_CALLBACK OnAudioReady = nullptr; LOCALSDPREADYTOSEND_CALLBACK OnLocalSdpReady = nullptr; - ICECANDIDATEREADYTOSEND_CALLBACK OnIceCandiateReady = nullptr; + ICECANDIDATEREADYTOSEND_CALLBACK OnIceCandidateReady = nullptr; bool is_mute_audio_ = false; bool is_record_audio_ = false; diff --git a/examples/unityplugin/unity_plugin_apis.cc b/examples/unityplugin/unity_plugin_apis.cc index 672330faec..6e34d7e1e0 100644 --- a/examples/unityplugin/unity_plugin_apis.cc +++ b/examples/unityplugin/unity_plugin_apis.cc @@ -184,13 +184,13 @@ bool RegisterOnLocalSdpReadytoSend(int peer_connection_id, return true; } -bool RegisterOnIceCandiateReadytoSend( +bool RegisterOnIceCandidateReadytoSend( int peer_connection_id, ICECANDIDATEREADYTOSEND_CALLBACK callback) { if (!g_peer_connection_map.count(peer_connection_id)) return false; - g_peer_connection_map[peer_connection_id]->RegisterOnIceCandiateReadytoSend( + g_peer_connection_map[peer_connection_id]->RegisterOnIceCandidateReadytoSend( callback); return true; } diff --git a/examples/unityplugin/unity_plugin_apis.h b/examples/unityplugin/unity_plugin_apis.h index 8b8fe0fe80..9790dc57b9 100644 --- a/examples/unityplugin/unity_plugin_apis.h +++ b/examples/unityplugin/unity_plugin_apis.h @@ -100,7 +100,7 @@ WEBRTC_PLUGIN_API bool RegisterOnAudioBusReady(int peer_connection_id, WEBRTC_PLUGIN_API bool RegisterOnLocalSdpReadytoSend( int peer_connection_id, LOCALSDPREADYTOSEND_CALLBACK callback); -WEBRTC_PLUGIN_API bool RegisterOnIceCandiateReadytoSend( +WEBRTC_PLUGIN_API bool RegisterOnIceCandidateReadytoSend( int peer_connection_id, ICECANDIDATEREADYTOSEND_CALLBACK callback); } diff --git a/p2p/base/p2p_transport_channel_unittest.cc b/p2p/base/p2p_transport_channel_unittest.cc index 2685d59751..c69530b0ef 100644 --- a/p2p/base/p2p_transport_channel_unittest.cc +++ b/p2p/base/p2p_transport_channel_unittest.cc @@ -6307,11 +6307,11 @@ TEST_P(GatherAfterConnectedTest, GatherAfterConnected) { clock.AdvanceTime(webrtc::TimeDelta::Millis(10 * delay)); if (stop_gather_on_strongly_connected) { - // The relay candiates gathered has not been propagated to channel. + // The relay candidates gathered has not been propagated to channel. EXPECT_EQ(ep1->saved_candidates_.size(), 0u); EXPECT_EQ(ep2->saved_candidates_.size(), 0u); } else { - // The relay candiates gathered has been propagated to channel. + // The relay candidates gathered has been propagated to channel. EXPECT_EQ(ep1->saved_candidates_.size(), 1u); EXPECT_EQ(ep2->saved_candidates_.size(), 1u); } @@ -6369,11 +6369,11 @@ TEST_P(GatherAfterConnectedTest, GatherAfterConnectedMultiHomed) { clock.AdvanceTime(webrtc::TimeDelta::Millis(10 * delay)); if (stop_gather_on_strongly_connected) { - // The relay candiates gathered has not been propagated to channel. + // The relay candidates gathered has not been propagated to channel. EXPECT_EQ(ep1->saved_candidates_.size(), 0u); EXPECT_EQ(ep2->saved_candidates_.size(), 0u); } else { - // The relay candiates gathered has been propagated. + // The relay candidates gathered has been propagated. EXPECT_EQ(ep1->saved_candidates_.size(), 2u); EXPECT_EQ(ep2->saved_candidates_.size(), 1u); } diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc index 23b11a7a3d..1197c44ab6 100644 --- a/p2p/base/port_unittest.cc +++ b/p2p/base/port_unittest.cc @@ -2626,7 +2626,7 @@ TEST_F(PortTest, TestCandidateFoundation) { } // This test verifies the related addresses of different types of -// ICE candiates. +// ICE candidates. TEST_F(PortTest, TestCandidateRelatedAddress) { auto nat_server = CreateNatServer(kNatAddr1, NAT_OPEN_CONE); auto udpport = CreateUdpPort(kLocalAddr1); diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc index 9b09ae8360..45fe212c65 100644 --- a/p2p/base/turn_port.cc +++ b/p2p/base/turn_port.cc @@ -560,7 +560,7 @@ Connection* TurnPort::CreateConnection(const Candidate& remote_candidate, return nullptr; } - // A TURN port will have two candiates, STUN and TURN. STUN may not + // A TURN port will have two candidates, STUN and TURN. STUN may not // present in all cases. If present stun candidate will be added first // and TURN candidate later. for (size_t index = 0; index < Candidates().size(); ++index) { diff --git a/pc/webrtc_sdp_unittest.cc b/pc/webrtc_sdp_unittest.cc index ea1b07d06a..a081d74aa4 100644 --- a/pc/webrtc_sdp_unittest.cc +++ b/pc/webrtc_sdp_unittest.cc @@ -2783,7 +2783,7 @@ TEST_F(WebRtcSdpTest, DeserializeCandidate) { } // This test verifies the deserialization of candidate-attribute -// as per RFC 5245. Candiate-attribute will be of the format +// as per RFC 5245. Candidate-attribute will be of the format // candidate:. This format will be used when candidates // are trickled. TEST_F(WebRtcSdpTest, DeserializeRawCandidateAttribute) {