zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused DeRegisterNetworkObserver.

Browse Source 
DeRegisterNetworkObserver is not used, since
RtpTransportControllerSend owns the thread on which
SendSideCongestionController runs it would not be safe to allow it to be
called from outside. Deregistration should be done by destroying
RtpTransportControllerSend.

In the future, the RegisterObserver functions should be removed as well,
in favor of providing the observer in the constructor. This requires
breaking a circular dependency between RtpTransportControllerSend and
Call.

Bug: webrtc:8415
Change-Id: Ifeb4c5d4a41e4d8419994b3146980bdaaf9cd6a9
Reviewed-on: https://webrtc-review.googlesource.com/58098
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22249}
This commit is contained in:
Sebastian Jansson
2018-03-01 12:44:27 +01:00
committed by Commit Bot
parent 98900740ad
commit 0f9d9a9a12
8 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
call/rtp_transport_controller_send.cc
View File

@ -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) {

1
call/rtp_transport_controller_send.h
View File

@ -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;

1
call/rtp_transport_controller_send_interface.h
View File

@ -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;

1
call/test/mock_rtp_transport_controller_send.h
View File

@ -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));

2
modules/congestion_controller/include/send_side_congestion_controller.h
View File

@ -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,

1
modules/congestion_controller/include/send_side_congestion_controller_interface.h
View File

@ -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;

1
modules/congestion_controller/rtp/include/send_side_congestion_controller.h
View File

@ -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,

14
modules/congestion_controller/rtp/send_side_congestion_controller.cc
View File

@ -117,7 +117,6 @@ class ControlHandler : public NetworkControllerObserver {
void OnPacerQueueUpdate(PacerQueueUpdate msg);
void RegisterNetworkObserver(NetworkChangedObserver* observer);
void DeRegisterNetworkObserver(NetworkChangedObserver* observer);
rtc::Optional<TargetTransferRate> 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,