mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-19 08:37:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Convert P2PTransportChannel Candidate Pair Change to CallbackList"

Browse source 
This reverts commit dc43cb24bd.

Reason for revert: Converted the wrong signal, should have been GatheringState.

Original change's description:
> Convert P2PTransportChannel Candidate Pair Change to CallbackList
>
> Earlier attempts have shown that this signal is multiply listened to.
>
> Bug: webrtc:11943
> Change-Id: If9130a7f4c70714b5afda5aca0469b66c8e2612f
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347981
> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#42124}

Bug: webrtc:11943
Change-Id: I73d5d815ced8d7aef4df765c9cf54d7637c6769d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/348220
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#42129}
This commit is contained in:
Harald Alvestrand 2024-04-20 07:40:29 +00:00 committed by WebRTC LUCI CQ
parent 0afde7614d
commit c869266b10
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
p2p/base/ice_transport_internal.h
View file

@ -338,15 +338,11 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal {
// SignalNetworkRouteChanged. // SignalNetworkRouteChanged.
sigslot::signal2<IceTransportInternal*, const Candidate&> SignalRouteChange; sigslot::signal2<IceTransportInternal*, const Candidate&> SignalRouteChange;
void AddCandidatePairChangeCallback( void SetCandidatePairChangeCallback(
const void* removal_tag,
absl::AnyInvocable<void(const cricket::CandidatePairChangeEvent&)> absl::AnyInvocable<void(const cricket::CandidatePairChangeEvent&)>
callback) { callback) {
candidate_pair_change_callback_list_.AddReceiver(removal_tag, RTC_DCHECK(!candidate_pair_change_callback_);
std::move(callback)); candidate_pair_change_callback_ = std::move(callback);
}
void RemoveCandidatePairChangeCallback(const void* removal_tag) {
candidate_pair_change_callback_list_.RemoveReceivers(removal_tag);
} }
// Invoked when there is conflict in the ICE role between local and remote // Invoked when there is conflict in the ICE role between local and remote
@ -389,8 +385,7 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal {
protected: protected:
void SendGatheringStateEvent() { SignalGatheringState(this); } void SendGatheringStateEvent() { SignalGatheringState(this); }
webrtc::CallbackList<const cricket::CandidatePairChangeEvent&>
candidate_pair_change_callback_list_;
webrtc::CallbackList<IceTransportInternal*, webrtc::CallbackList<IceTransportInternal*,
const StunDictionaryView&, const StunDictionaryView&,
rtc::ArrayView<uint16_t>> rtc::ArrayView<uint16_t>>
@ -406,6 +401,9 @@ class RTC_EXPORT IceTransportInternal : public rtc::PacketTransportInternal {
absl::AnyInvocable<void(IceTransportInternal*, const Candidates&)> absl::AnyInvocable<void(IceTransportInternal*, const Candidates&)>
candidates_removed_callback_; candidates_removed_callback_;
absl::AnyInvocable<void(const cricket::CandidatePairChangeEvent&)>
candidate_pair_change_callback_;
private: private:
// TODO(bugs.webrtc.org/11943): remove when removing Signal // TODO(bugs.webrtc.org/11943): remove when removing Signal
void SignalGatheringStateFired(IceTransportInternal* transport) { void SignalGatheringStateFired(IceTransportInternal* transport) {

4
p2p/base/p2p_transport_channel.cc
View file

@ -1838,7 +1838,9 @@ void P2PTransportChannel::SwitchSelectedConnectionInternal(
} else { } else {
pair_change.estimated_disconnected_time_ms = 0; pair_change.estimated_disconnected_time_ms = 0;
} }
candidate_pair_change_callback_list_.Send(pair_change); if (candidate_pair_change_callback_) {
candidate_pair_change_callback_(pair_change);
}
} }
++selected_candidate_pair_changes_; ++selected_candidate_pair_changes_;

4
p2p/base/p2p_transport_channel_unittest.cc
View file

@ -3326,8 +3326,8 @@ class P2PTransportChannelPingTest : public ::testing::Test,
&P2PTransportChannelPingTest::OnReadyToSend); &P2PTransportChannelPingTest::OnReadyToSend);
ch->SignalStateChanged.connect( ch->SignalStateChanged.connect(
this, &P2PTransportChannelPingTest::OnChannelStateChanged); this, &P2PTransportChannelPingTest::OnChannelStateChanged);
ch->AddCandidatePairChangeCallback( ch->SetCandidatePairChangeCallback(
this, [this](const cricket::CandidatePairChangeEvent& event) { [this](const cricket::CandidatePairChangeEvent& event) {
OnCandidatePairChanged(event); OnCandidatePairChanged(event);
}); });
} }

4
pc/jsep_transport_controller.cc
View file

@ -464,8 +464,8 @@ JsepTransportController::CreateDtlsTransport(
this, &JsepTransportController::OnTransportStateChanged_n); this, &JsepTransportController::OnTransportStateChanged_n);
dtls->ice_transport()->SignalIceTransportStateChanged.connect( dtls->ice_transport()->SignalIceTransportStateChanged.connect(
this, &JsepTransportController::OnTransportStateChanged_n); this, &JsepTransportController::OnTransportStateChanged_n);
dtls->ice_transport()->AddCandidatePairChangeCallback( dtls->ice_transport()->SetCandidatePairChangeCallback(
this, [this](const cricket::CandidatePairChangeEvent& event) { [this](const cricket::CandidatePairChangeEvent& event) {
RTC_DCHECK_RUN_ON(network_thread_); RTC_DCHECK_RUN_ON(network_thread_);
OnTransportCandidatePairChanged_n(event); OnTransportCandidatePairChanged_n(event);
}); });