diff --git a/call/rtp_transport_controller_send.cc b/call/rtp_transport_controller_send.cc index f206057e68..7e447c547c 100644 --- a/call/rtp_transport_controller_send.cc +++ b/call/rtp_transport_controller_send.cc @@ -93,10 +93,6 @@ void RtpTransportControllerSend::RegisterNetworkObserver( NetworkChangedObserver* observer) { send_side_cc_->RegisterNetworkObserver(observer); } -void RtpTransportControllerSend::DeRegisterNetworkObserver( - NetworkChangedObserver* observer) { - send_side_cc_->DeRegisterNetworkObserver(observer); -} void RtpTransportControllerSend::OnNetworkRouteChanged( const std::string& transport_name, const rtc::NetworkRoute& network_route) { diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h index 484748fff9..c909511386 100644 --- a/call/rtp_transport_controller_send.h +++ b/call/rtp_transport_controller_send.h @@ -56,7 +56,6 @@ class RtpTransportControllerSend : public RtpTransportControllerSendInterface { void DeRegisterPacketFeedbackObserver( PacketFeedbackObserver* observer) override; void RegisterNetworkObserver(NetworkChangedObserver* observer) override; - void DeRegisterNetworkObserver(NetworkChangedObserver* observer) override; void OnNetworkRouteChanged(const std::string& transport_name, const rtc::NetworkRoute& network_route) override; void OnNetworkAvailability(bool network_available) override; diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h index cc890860d6..2c49889bc5 100644 --- a/call/rtp_transport_controller_send_interface.h +++ b/call/rtp_transport_controller_send_interface.h @@ -90,7 +90,6 @@ class RtpTransportControllerSendInterface { virtual void DeRegisterPacketFeedbackObserver( PacketFeedbackObserver* observer) = 0; virtual void RegisterNetworkObserver(NetworkChangedObserver* observer) = 0; - virtual void DeRegisterNetworkObserver(NetworkChangedObserver* observer) = 0; virtual void OnNetworkRouteChanged( const std::string& transport_name, const rtc::NetworkRoute& network_route) = 0; diff --git a/call/test/mock_rtp_transport_controller_send.h b/call/test/mock_rtp_transport_controller_send.h index 4870007cb5..85c6e58221 100644 --- a/call/test/mock_rtp_transport_controller_send.h +++ b/call/test/mock_rtp_transport_controller_send.h @@ -40,7 +40,6 @@ class MockRtpTransportControllerSend MOCK_METHOD1(RegisterPacketFeedbackObserver, void(PacketFeedbackObserver*)); MOCK_METHOD1(DeRegisterPacketFeedbackObserver, void(PacketFeedbackObserver*)); MOCK_METHOD1(RegisterNetworkObserver, void(NetworkChangedObserver*)); - MOCK_METHOD1(DeRegisterNetworkObserver, void(NetworkChangedObserver*)); MOCK_METHOD2(OnNetworkRouteChanged, void(const std::string&, const rtc::NetworkRoute&)); MOCK_METHOD1(OnNetworkAvailability, void(bool)); diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h index 996d48dc54..9f2d0a6986 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/include/send_side_congestion_controller.h @@ -62,7 +62,7 @@ class SendSideCongestionController // try to break this circular chain of references, and make the observer a // construction time constant. void RegisterNetworkObserver(Observer* observer) override; - void DeRegisterNetworkObserver(Observer* observer) override; + virtual void DeRegisterNetworkObserver(Observer* observer); void SetBweBitrates(int min_bitrate_bps, int start_bitrate_bps, diff --git a/modules/congestion_controller/include/send_side_congestion_controller_interface.h b/modules/congestion_controller/include/send_side_congestion_controller_interface.h index 9fdec832b1..4d64424fa7 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller_interface.h +++ b/modules/congestion_controller/include/send_side_congestion_controller_interface.h @@ -46,7 +46,6 @@ class SendSideCongestionControllerInterface : public CallStatsObserver, virtual void DeRegisterPacketFeedbackObserver( PacketFeedbackObserver* observer) = 0; virtual void RegisterNetworkObserver(NetworkChangedObserver* observer) = 0; - virtual void DeRegisterNetworkObserver(NetworkChangedObserver* observer) = 0; virtual void SetBweBitrates(int min_bitrate_bps, int start_bitrate_bps, int max_bitrate_bps) = 0; diff --git a/modules/congestion_controller/rtp/include/send_side_congestion_controller.h b/modules/congestion_controller/rtp/include/send_side_congestion_controller.h index 489cc682fc..220800dcd2 100644 --- a/modules/congestion_controller/rtp/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/rtp/include/send_side_congestion_controller.h @@ -76,7 +76,6 @@ class SendSideCongestionController // try to break this circular chain of references, and make the observer a // construction time constant. void RegisterNetworkObserver(NetworkChangedObserver* observer) override; - void DeRegisterNetworkObserver(NetworkChangedObserver* observer) override; void SetBweBitrates(int min_bitrate_bps, int start_bitrate_bps, diff --git a/modules/congestion_controller/rtp/send_side_congestion_controller.cc b/modules/congestion_controller/rtp/send_side_congestion_controller.cc index 925fe32706..d2be85468e 100644 --- a/modules/congestion_controller/rtp/send_side_congestion_controller.cc +++ b/modules/congestion_controller/rtp/send_side_congestion_controller.cc @@ -117,7 +117,6 @@ class ControlHandler : public NetworkControllerObserver { void OnPacerQueueUpdate(PacerQueueUpdate msg); void RegisterNetworkObserver(NetworkChangedObserver* observer); - void DeRegisterNetworkObserver(NetworkChangedObserver* observer); rtc::Optional last_transfer_rate(); bool pacer_configured(); @@ -208,13 +207,6 @@ void ControlHandler::RegisterNetworkObserver(NetworkChangedObserver* observer) { observer_ = observer; } -void ControlHandler::DeRegisterNetworkObserver( - NetworkChangedObserver* observer) { - RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_checker_); - RTC_DCHECK_EQ(observer_, observer); - observer_ = nullptr; -} - void ControlHandler::OnNetworkInvalidation() { if (!current_target_rate_msg_.has_value()) return; @@ -351,12 +343,6 @@ void SendSideCongestionController::RegisterNetworkObserver( }); } -void SendSideCongestionController::DeRegisterNetworkObserver( - NetworkChangedObserver* observer) { - WaitOnTask([this, observer]() { - control_handler->DeRegisterNetworkObserver(observer); - }); -} void SendSideCongestionController::SetBweBitrates(int min_bitrate_bps, int start_bitrate_bps,