diff --git a/api/DEPS b/api/DEPS index 96fd36b9ba..9bb179a065 100644 --- a/api/DEPS +++ b/api/DEPS @@ -111,6 +111,7 @@ specific_include_rules = { "media_transport_interface\.h": [ "+rtc_base/copy_on_write_buffer.h", # As used by datachannelinterface.h "+rtc_base/network_route.h", + "+rtc_base/deprecation.h", ], "peer_connection_factory_proxy\.h": [ diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index ad1f7c6ed3..cc97b353e8 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -29,6 +29,7 @@ #include "api/units/data_rate.h" #include "api/video/encoded_image.h" #include "rtc_base/copy_on_write_buffer.h" +#include "rtc_base/deprecation.h" #include "rtc_base/network_route.h" namespace rtc { @@ -435,6 +436,7 @@ class MediaTransportInterface { // setting it to nullptr. // TODO(nisse): The SetNetworkChangeCallback is being replaced with Add/Remove // methods, because both video channel and voice channel need to register. + RTC_DEPRECATED virtual void SetNetworkChangeCallback( MediaTransportNetworkChangeCallback* callback); virtual void AddNetworkChangeCallback( diff --git a/pc/channel.cc b/pc/channel.cc index 0e913959b7..a408a85729 100644 --- a/pc/channel.cc +++ b/pc/channel.cc @@ -154,7 +154,7 @@ BaseChannel::~BaseChannel() { RTC_DCHECK_RUN_ON(worker_thread_); if (media_transport_) { - media_transport_->SetNetworkChangeCallback(nullptr); + media_transport_->RemoveNetworkChangeCallback(this); } // Eats any outstanding messages or packets. @@ -217,7 +217,7 @@ void BaseChannel::Init_w(webrtc::RtpTransportInternal* rtp_transport, RTC_LOG(LS_INFO) << "BaseChannel::Init_w, media_transport=" << (media_transport_ != nullptr); if (media_transport_) { - media_transport_->SetNetworkChangeCallback(this); + media_transport_->AddNetworkChangeCallback(this); } }