From 5419ac8c026bdbd4f5690a03af106bc3cb7211dd Mon Sep 17 00:00:00 2001 From: "elad.alon" Date: Mon, 6 Mar 2017 03:11:06 -0800 Subject: [PATCH] Remove unused RemoteBitrateEstimator::IncomingPacketFeedbackVector() BUG=None Review-Url: https://codereview.webrtc.org/2721463003 Cr-Commit-Position: refs/heads/master@{#17058} --- .../include/mock/mock_remote_bitrate_estimator.h | 2 -- .../include/remote_bitrate_estimator.h | 5 ----- .../remote_bitrate_estimator_abs_send_time.cc | 10 ---------- .../remote_bitrate_estimator_abs_send_time.h | 3 --- .../remote_bitrate_estimator/remote_estimator_proxy.cc | 7 ------- .../remote_bitrate_estimator/remote_estimator_proxy.h | 2 -- 6 files changed, 29 deletions(-) diff --git a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h index b8cc8ef555..8ef645b131 100644 --- a/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h +++ b/webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h @@ -26,8 +26,6 @@ class MockRemoteBitrateObserver : public RemoteBitrateObserver { class MockRemoteBitrateEstimator : public RemoteBitrateEstimator { public: - MOCK_METHOD1(IncomingPacketFeedbackVector, - void(const std::vector&)); MOCK_METHOD3(IncomingPacket, void(int64_t, size_t, const RTPHeader&)); MOCK_METHOD1(RemoveStream, void(uint32_t)); MOCK_CONST_METHOD2(LatestEstimate, bool(std::vector*, uint32_t*)); diff --git a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h b/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h index 29dd81bf27..596c343699 100644 --- a/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h +++ b/webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h @@ -46,11 +46,6 @@ class RemoteBitrateEstimator : public CallStatsObserver, public Module { public: virtual ~RemoteBitrateEstimator() {} - virtual void IncomingPacketFeedbackVector( - const std::vector& packet_feedback_vector) { - assert(false); - } - // Called for each incoming packet. Updates the incoming payload bitrate // estimate and the over-use detector. If an over-use is detected the // remote bitrate estimate will be updated. Note that |payload_size| is the diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc index 7d1b50bf66..ea70619eea 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc @@ -208,16 +208,6 @@ bool RemoteBitrateEstimatorAbsSendTime::IsBitrateImproving( return initial_probe || bitrate_above_estimate; } -void RemoteBitrateEstimatorAbsSendTime::IncomingPacketFeedbackVector( - const std::vector& packet_feedback_vector) { - RTC_DCHECK(network_thread_.CalledOnValidThread()); - for (const auto& packet_info : packet_feedback_vector) { - IncomingPacketInfo(packet_info.arrival_time_ms, - ConvertMsTo24Bits(packet_info.send_time_ms), - packet_info.payload_size, 0); - } -} - void RemoteBitrateEstimatorAbsSendTime::IncomingPacket( int64_t arrival_time_ms, size_t payload_size, diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h index 6e37698436..f88a2fc032 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h @@ -72,9 +72,6 @@ class RemoteBitrateEstimatorAbsSendTime : public RemoteBitrateEstimator { Clock* clock); virtual ~RemoteBitrateEstimatorAbsSendTime() {} - void IncomingPacketFeedbackVector( - const std::vector& packet_feedback_vector) override; - void IncomingPacket(int64_t arrival_time_ms, size_t payload_size, const RTPHeader& header) override; diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc index 5e7560a779..241c7d78a1 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc @@ -45,13 +45,6 @@ RemoteEstimatorProxy::RemoteEstimatorProxy(Clock* clock, RemoteEstimatorProxy::~RemoteEstimatorProxy() {} -void RemoteEstimatorProxy::IncomingPacketFeedbackVector( - const std::vector& packet_feedback_vector) { - rtc::CritScope cs(&lock_); - for (PacketInfo info : packet_feedback_vector) - OnPacketArrival(info.sequence_number, info.arrival_time_ms); -} - void RemoteEstimatorProxy::IncomingPacket(int64_t arrival_time_ms, size_t payload_size, const RTPHeader& header) { diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h index 71099bf9ed..c6931515e1 100644 --- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h +++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h @@ -35,8 +35,6 @@ class RemoteEstimatorProxy : public RemoteBitrateEstimator { RemoteEstimatorProxy(Clock* clock, PacketRouter* packet_router); virtual ~RemoteEstimatorProxy(); - void IncomingPacketFeedbackVector( - const std::vector& packet_feedback_vector) override; void IncomingPacket(int64_t arrival_time_ms, size_t payload_size, const RTPHeader& header) override;