From 5eae1d994e202da95d3ca0921bb1f09ea1d827c4 Mon Sep 17 00:00:00 2001 From: "Piotr (Peter) Slatala" Date: Fri, 16 Nov 2018 13:14:34 -0800 Subject: [PATCH] Remove legacy SetTargetTransferRateObserver Bug: webrtc:9719 Change-Id: I04e892ce0f2af5c48040dd92ff0701209104fe65 Reviewed-on: https://webrtc-review.googlesource.com/c/111287 Reviewed-by: Anton Sukhanov Reviewed-by: Steve Anton Commit-Queue: Steve Anton Cr-Commit-Position: refs/heads/master@{#25734} --- api/media_transport_interface.cc | 3 --- api/media_transport_interface.h | 9 --------- api/test/fake_media_transport.h | 3 --- api/test/loopback_media_transport.h | 8 -------- 4 files changed, 23 deletions(-) diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc index 039a4a1e57..ef223aa788 100644 --- a/api/media_transport_interface.cc +++ b/api/media_transport_interface.cc @@ -114,9 +114,6 @@ void MediaTransportInterface::SetNetworkChangeCallback( void MediaTransportInterface::RemoveTargetTransferRateObserver( webrtc::TargetTransferRateObserver* observer) {} -void MediaTransportInterface::SetTargetTransferRateObserver( - webrtc::TargetTransferRateObserver* observer) {} - void MediaTransportInterface::AddTargetTransferRateObserver( webrtc::TargetTransferRateObserver* observer) {} diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index 5aac712e46..b10dd63a46 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -335,15 +335,6 @@ class MediaTransportInterface { // pass a nullptr. virtual void SetReceiveVideoSink(MediaTransportVideoSinkInterface* sink) = 0; - // Sets a target bitrate observer. Before media transport is destructed - // the observer must be unregistered (set to nullptr). - // A newly registered observer will be called back with the latest recorded - // target rate, if available. - // TODO(psla): This method will be removed, in favor of - // AddTargetTransferRateObserver. - virtual void SetTargetTransferRateObserver( - TargetTransferRateObserver* observer); - // Adds a target bitrate observer. Before media transport is destructed // the observer must be unregistered (by calling // RemoveTargetTransferRateObserver). diff --git a/api/test/fake_media_transport.h b/api/test/fake_media_transport.h index 801852953d..eb6ec93ae2 100644 --- a/api/test/fake_media_transport.h +++ b/api/test/fake_media_transport.h @@ -55,9 +55,6 @@ class FakeMediaTransport : public MediaTransportInterface { return settings_.pre_shared_key; } - void SetTargetTransferRateObserver( - webrtc::TargetTransferRateObserver* observer) override {} - RTCError SendData(int channel_id, const SendDataParams& params, const rtc::CopyOnWriteBuffer& buffer) override { diff --git a/api/test/loopback_media_transport.h b/api/test/loopback_media_transport.h index dbb674db83..48255b135e 100644 --- a/api/test/loopback_media_transport.h +++ b/api/test/loopback_media_transport.h @@ -52,11 +52,6 @@ class WrapperMediaTransport : public MediaTransportInterface { wrapped_->SetReceiveVideoSink(sink); } - void SetTargetTransferRateObserver( - webrtc::TargetTransferRateObserver* observer) override { - wrapped_->SetTargetTransferRateObserver(observer); - } - void SetMediaTransportStateCallback( MediaTransportStateCallback* callback) override { wrapped_->SetMediaTransportStateCallback(callback); @@ -178,9 +173,6 @@ class MediaTransportPair { void SetReceiveVideoSink(MediaTransportVideoSinkInterface* sink) override {} - void SetTargetTransferRateObserver( - webrtc::TargetTransferRateObserver* observer) override {} - void SetMediaTransportStateCallback( MediaTransportStateCallback* callback) override { rtc::CritScope lock(&sink_lock_);