Fixed typos, candiate -> candidate

Bug: None
Change-Id: I2dee549aa79f1eb6bddd58cfc6c9f67eb6ba3663
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256147
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36273}
This commit is contained in:
David Sanders 2022-03-19 01:43:10 -07:00 committed by WebRTC LUCI CQ
parent 9d52093ff9
commit 60c588d77e
10 changed files with 31 additions and 30 deletions

View file

@ -35,6 +35,7 @@ CZ Theng <cz.theng@gmail.com>
Danail Kirov <dkirovbroadsoft@gmail.com> Danail Kirov <dkirovbroadsoft@gmail.com>
Dave Cowart <davecowart@gmail.com> Dave Cowart <davecowart@gmail.com>
David Porter <david@porter.me> David Porter <david@porter.me>
David Sanders <dsanders11@ucsbalum.com>
Dax Booysen <dax@younow.com> Dax Booysen <dax@younow.com>
Dennis Angelo <dennis.angelo@gmail.com> Dennis Angelo <dennis.angelo@gmail.com>
Dharmesh Chauhan <dharmesh.r.chauhan@gmail.com> Dharmesh Chauhan <dharmesh.r.chauhan@gmail.com>

View file

@ -124,13 +124,13 @@ namespace SimplePeerConnectionM {
LocalSdpReadytoSendInternalDelegate callback); LocalSdpReadytoSendInternalDelegate callback);
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
private delegate void IceCandiateReadytoSendInternalDelegate( private delegate void IceCandidateReadytoSendInternalDelegate(
string candidate, int sdpMlineIndex, string sdpMid); string candidate, int sdpMlineIndex, string sdpMid);
public delegate void IceCandiateReadytoSendDelegate( public delegate void IceCandidateReadytoSendDelegate(
int id, string candidate, int sdpMlineIndex, string sdpMid); int id, string candidate, int sdpMlineIndex, string sdpMid);
[DllImport(dllPath, CallingConvention = CallingConvention.Cdecl)] [DllImport(dllPath, CallingConvention = CallingConvention.Cdecl)]
private static extern bool RegisterOnIceCandiateReadytoSend( private static extern bool RegisterOnIceCandidateReadytoSend(
int peerConnectionId, IceCandiateReadytoSendInternalDelegate callback); int peerConnectionId, IceCandidateReadytoSendInternalDelegate callback);
[DllImport(dllPath, CallingConvention = CallingConvention.Cdecl)] [DllImport(dllPath, CallingConvention = CallingConvention.Cdecl)]
private static extern bool SetRemoteDescription(int peerConnectionId, string type, string sdp); private static extern bool SetRemoteDescription(int peerConnectionId, string type, string sdp);
@ -215,10 +215,10 @@ namespace SimplePeerConnectionM {
RaiseLocalSdpReadytoSend); RaiseLocalSdpReadytoSend);
RegisterOnLocalSdpReadytoSend(mPeerConnectionId, localSdpReadytoSendDelegate); RegisterOnLocalSdpReadytoSend(mPeerConnectionId, localSdpReadytoSendDelegate);
iceCandiateReadytoSendDelegate = iceCandidateReadytoSendDelegate =
new IceCandiateReadytoSendInternalDelegate(RaiseIceCandiateReadytoSend); new IceCandidateReadytoSendInternalDelegate(RaiseIceCandidateReadytoSend);
RegisterOnIceCandiateReadytoSend( RegisterOnIceCandidateReadytoSend(
mPeerConnectionId, iceCandiateReadytoSendDelegate); mPeerConnectionId, iceCandidateReadytoSendDelegate);
} }
private void RaiseLocalDataChannelReady() { private void RaiseLocalDataChannelReady() {
@ -267,9 +267,9 @@ namespace SimplePeerConnectionM {
OnLocalSdpReadytoSend(mPeerConnectionId, type, sdp); OnLocalSdpReadytoSend(mPeerConnectionId, type, sdp);
} }
private void RaiseIceCandiateReadytoSend(string candidate, int sdpMlineIndex, string sdpMid) { private void RaiseIceCandidateReadytoSend(string candidate, int sdpMlineIndex, string sdpMid) {
if (OnIceCandiateReadytoSend != null) if (OnIceCandidateReadytoSend != null)
OnIceCandiateReadytoSend(mPeerConnectionId, candidate, sdpMlineIndex, sdpMid); OnIceCandidateReadytoSend(mPeerConnectionId, candidate, sdpMlineIndex, sdpMid);
} }
public void AddQueuedIceCandidate(List<IceCandidate> iceCandidateQueue) { public void AddQueuedIceCandidate(List<IceCandidate> iceCandidateQueue) {
@ -301,8 +301,8 @@ namespace SimplePeerConnectionM {
private LocalSdpReadytoSendInternalDelegate localSdpReadytoSendDelegate = null; private LocalSdpReadytoSendInternalDelegate localSdpReadytoSendDelegate = null;
public event LocalSdpReadytoSendDelegate OnLocalSdpReadytoSend; public event LocalSdpReadytoSendDelegate OnLocalSdpReadytoSend;
private IceCandiateReadytoSendInternalDelegate iceCandiateReadytoSendDelegate = null; private IceCandidateReadytoSendInternalDelegate iceCandidateReadytoSendDelegate = null;
public event IceCandiateReadytoSendDelegate OnIceCandiateReadytoSend; public event IceCandidateReadytoSendDelegate OnIceCandidateReadytoSend;
private int mPeerConnectionId = -1; private int mPeerConnectionId = -1;
} }

View file

@ -286,8 +286,8 @@ void SimplePeerConnection::OnIceCandidate(
return; return;
} }
if (OnIceCandiateReady) if (OnIceCandidateReady)
OnIceCandiateReady(sdp.c_str(), candidate->sdp_mline_index(), OnIceCandidateReady(sdp.c_str(), candidate->sdp_mline_index(),
candidate->sdp_mid().c_str()); candidate->sdp_mid().c_str());
} }
@ -327,9 +327,9 @@ void SimplePeerConnection::RegisterOnLocalSdpReadytoSend(
OnLocalSdpReady = callback; OnLocalSdpReady = callback;
} }
void SimplePeerConnection::RegisterOnIceCandiateReadytoSend( void SimplePeerConnection::RegisterOnIceCandidateReadytoSend(
ICECANDIDATEREADYTOSEND_CALLBACK callback) { ICECANDIDATEREADYTOSEND_CALLBACK callback) {
OnIceCandiateReady = callback; OnIceCandidateReady = callback;
} }
bool SimplePeerConnection::SetRemoteDescription(const char* type, bool SimplePeerConnection::SetRemoteDescription(const char* type,

View file

@ -52,7 +52,7 @@ class SimplePeerConnection : public webrtc::PeerConnectionObserver,
void RegisterOnFailure(FAILURE_CALLBACK callback); void RegisterOnFailure(FAILURE_CALLBACK callback);
void RegisterOnAudioBusReady(AUDIOBUSREADY_CALLBACK callback); void RegisterOnAudioBusReady(AUDIOBUSREADY_CALLBACK callback);
void RegisterOnLocalSdpReadytoSend(LOCALSDPREADYTOSEND_CALLBACK callback); void RegisterOnLocalSdpReadytoSend(LOCALSDPREADYTOSEND_CALLBACK callback);
void RegisterOnIceCandiateReadytoSend( void RegisterOnIceCandidateReadytoSend(
ICECANDIDATEREADYTOSEND_CALLBACK callback); ICECANDIDATEREADYTOSEND_CALLBACK callback);
bool SetRemoteDescription(const char* type, const char* sdp); bool SetRemoteDescription(const char* type, const char* sdp);
bool AddIceCandidate(const char* sdp, bool AddIceCandidate(const char* sdp,
@ -121,7 +121,7 @@ class SimplePeerConnection : public webrtc::PeerConnectionObserver,
AUDIOBUSREADY_CALLBACK OnAudioReady = nullptr; AUDIOBUSREADY_CALLBACK OnAudioReady = nullptr;
LOCALSDPREADYTOSEND_CALLBACK OnLocalSdpReady = nullptr; LOCALSDPREADYTOSEND_CALLBACK OnLocalSdpReady = nullptr;
ICECANDIDATEREADYTOSEND_CALLBACK OnIceCandiateReady = nullptr; ICECANDIDATEREADYTOSEND_CALLBACK OnIceCandidateReady = nullptr;
bool is_mute_audio_ = false; bool is_mute_audio_ = false;
bool is_record_audio_ = false; bool is_record_audio_ = false;

View file

@ -184,13 +184,13 @@ bool RegisterOnLocalSdpReadytoSend(int peer_connection_id,
return true; return true;
} }
bool RegisterOnIceCandiateReadytoSend( bool RegisterOnIceCandidateReadytoSend(
int peer_connection_id, int peer_connection_id,
ICECANDIDATEREADYTOSEND_CALLBACK callback) { ICECANDIDATEREADYTOSEND_CALLBACK callback) {
if (!g_peer_connection_map.count(peer_connection_id)) if (!g_peer_connection_map.count(peer_connection_id))
return false; return false;
g_peer_connection_map[peer_connection_id]->RegisterOnIceCandiateReadytoSend( g_peer_connection_map[peer_connection_id]->RegisterOnIceCandidateReadytoSend(
callback); callback);
return true; return true;
} }

View file

@ -100,7 +100,7 @@ WEBRTC_PLUGIN_API bool RegisterOnAudioBusReady(int peer_connection_id,
WEBRTC_PLUGIN_API bool RegisterOnLocalSdpReadytoSend( WEBRTC_PLUGIN_API bool RegisterOnLocalSdpReadytoSend(
int peer_connection_id, int peer_connection_id,
LOCALSDPREADYTOSEND_CALLBACK callback); LOCALSDPREADYTOSEND_CALLBACK callback);
WEBRTC_PLUGIN_API bool RegisterOnIceCandiateReadytoSend( WEBRTC_PLUGIN_API bool RegisterOnIceCandidateReadytoSend(
int peer_connection_id, int peer_connection_id,
ICECANDIDATEREADYTOSEND_CALLBACK callback); ICECANDIDATEREADYTOSEND_CALLBACK callback);
} }

View file

@ -6307,11 +6307,11 @@ TEST_P(GatherAfterConnectedTest, GatherAfterConnected) {
clock.AdvanceTime(webrtc::TimeDelta::Millis(10 * delay)); clock.AdvanceTime(webrtc::TimeDelta::Millis(10 * delay));
if (stop_gather_on_strongly_connected) { 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(ep1->saved_candidates_.size(), 0u);
EXPECT_EQ(ep2->saved_candidates_.size(), 0u); EXPECT_EQ(ep2->saved_candidates_.size(), 0u);
} else { } 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(ep1->saved_candidates_.size(), 1u);
EXPECT_EQ(ep2->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)); clock.AdvanceTime(webrtc::TimeDelta::Millis(10 * delay));
if (stop_gather_on_strongly_connected) { 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(ep1->saved_candidates_.size(), 0u);
EXPECT_EQ(ep2->saved_candidates_.size(), 0u); EXPECT_EQ(ep2->saved_candidates_.size(), 0u);
} else { } else {
// The relay candiates gathered has been propagated. // The relay candidates gathered has been propagated.
EXPECT_EQ(ep1->saved_candidates_.size(), 2u); EXPECT_EQ(ep1->saved_candidates_.size(), 2u);
EXPECT_EQ(ep2->saved_candidates_.size(), 1u); EXPECT_EQ(ep2->saved_candidates_.size(), 1u);
} }

View file

@ -2626,7 +2626,7 @@ TEST_F(PortTest, TestCandidateFoundation) {
} }
// This test verifies the related addresses of different types of // This test verifies the related addresses of different types of
// ICE candiates. // ICE candidates.
TEST_F(PortTest, TestCandidateRelatedAddress) { TEST_F(PortTest, TestCandidateRelatedAddress) {
auto nat_server = CreateNatServer(kNatAddr1, NAT_OPEN_CONE); auto nat_server = CreateNatServer(kNatAddr1, NAT_OPEN_CONE);
auto udpport = CreateUdpPort(kLocalAddr1); auto udpport = CreateUdpPort(kLocalAddr1);

View file

@ -560,7 +560,7 @@ Connection* TurnPort::CreateConnection(const Candidate& remote_candidate,
return nullptr; 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 // present in all cases. If present stun candidate will be added first
// and TURN candidate later. // and TURN candidate later.
for (size_t index = 0; index < Candidates().size(); ++index) { for (size_t index = 0; index < Candidates().size(); ++index) {

View file

@ -2783,7 +2783,7 @@ TEST_F(WebRtcSdpTest, DeserializeCandidate) {
} }
// This test verifies the deserialization of candidate-attribute // 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:<blah>. This format will be used when candidates // candidate:<blah>. This format will be used when candidates
// are trickled. // are trickled.
TEST_F(WebRtcSdpTest, DeserializeRawCandidateAttribute) { TEST_F(WebRtcSdpTest, DeserializeRawCandidateAttribute) {