Clean up last_packet_received_time_ as it's no longer used.
Bug: webrtc:15377 Change-Id: I5453b9fd572a04dbea3241a2eb1c8ad8bb8b1186 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/320560 Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Björn Terelius <terelius@webrtc.org> Commit-Queue: Ying Wang <yinwa@webrtc.org> Cr-Commit-Position: refs/heads/main@{#40792}
This commit is contained in:
parent
d2f4cf9fd1
commit
2f4bc64166
@ -79,9 +79,6 @@ class NetworkControllerInterface {
|
|||||||
// Called when a packet is sent on the network.
|
// Called when a packet is sent on the network.
|
||||||
ABSL_MUST_USE_RESULT virtual NetworkControlUpdate OnSentPacket(
|
ABSL_MUST_USE_RESULT virtual NetworkControlUpdate OnSentPacket(
|
||||||
SentPacket) = 0;
|
SentPacket) = 0;
|
||||||
// Called when a packet is received from the remote client.
|
|
||||||
ABSL_MUST_USE_RESULT virtual NetworkControlUpdate OnReceivedPacket(
|
|
||||||
ReceivedPacket) = 0;
|
|
||||||
// Called when the stream specific configuration has been updated.
|
// Called when the stream specific configuration has been updated.
|
||||||
ABSL_MUST_USE_RESULT virtual NetworkControlUpdate OnStreamsConfig(
|
ABSL_MUST_USE_RESULT virtual NetworkControlUpdate OnStreamsConfig(
|
||||||
StreamsConfig) = 0;
|
StreamsConfig) = 0;
|
||||||
|
|||||||
@ -39,10 +39,6 @@ class MockNetworkControllerInterface : public NetworkControllerInterface {
|
|||||||
(RoundTripTimeUpdate),
|
(RoundTripTimeUpdate),
|
||||||
(override));
|
(override));
|
||||||
MOCK_METHOD(NetworkControlUpdate, OnSentPacket, (SentPacket), (override));
|
MOCK_METHOD(NetworkControlUpdate, OnSentPacket, (SentPacket), (override));
|
||||||
MOCK_METHOD(NetworkControlUpdate,
|
|
||||||
OnReceivedPacket,
|
|
||||||
(ReceivedPacket),
|
|
||||||
(override));
|
|
||||||
MOCK_METHOD(NetworkControlUpdate,
|
MOCK_METHOD(NetworkControlUpdate,
|
||||||
OnStreamsConfig,
|
OnStreamsConfig,
|
||||||
(StreamsConfig),
|
(StreamsConfig),
|
||||||
|
|||||||
@ -1460,7 +1460,6 @@ void Call::NotifyBweOfReceivedPacket(const RtpPacketReceived& packet,
|
|||||||
if (packet.GetExtension<AbsoluteSendTime>(&time_24)) {
|
if (packet.GetExtension<AbsoluteSendTime>(&time_24)) {
|
||||||
packet_msg.send_time = AbsoluteSendTime::ToTimestamp(time_24);
|
packet_msg.send_time = AbsoluteSendTime::ToTimestamp(time_24);
|
||||||
}
|
}
|
||||||
transport_send_->OnReceivedPacket(packet_msg);
|
|
||||||
|
|
||||||
receive_side_cc_.OnReceivedPacket(packet, media_type);
|
receive_side_cc_.OnReceivedPacket(packet, media_type);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -419,13 +419,6 @@ void RtpTransportControllerSend::ProcessSentPacketUpdates(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void RtpTransportControllerSend::OnReceivedPacket(
|
|
||||||
const ReceivedPacket& packet_msg) {
|
|
||||||
RTC_DCHECK_RUN_ON(&sequence_checker_);
|
|
||||||
if (controller_)
|
|
||||||
PostUpdates(controller_->OnReceivedPacket(packet_msg));
|
|
||||||
}
|
|
||||||
|
|
||||||
void RtpTransportControllerSend::UpdateBitrateConstraints(
|
void RtpTransportControllerSend::UpdateBitrateConstraints(
|
||||||
const BitrateConstraints& updated) {
|
const BitrateConstraints& updated) {
|
||||||
RTC_DCHECK_RUN_ON(&sequence_checker_);
|
RTC_DCHECK_RUN_ON(&sequence_checker_);
|
||||||
|
|||||||
@ -96,7 +96,6 @@ class RtpTransportControllerSend final
|
|||||||
absl::optional<Timestamp> GetFirstPacketTime() const override;
|
absl::optional<Timestamp> GetFirstPacketTime() const override;
|
||||||
void EnablePeriodicAlrProbing(bool enable) override;
|
void EnablePeriodicAlrProbing(bool enable) override;
|
||||||
void OnSentPacket(const rtc::SentPacket& sent_packet) override;
|
void OnSentPacket(const rtc::SentPacket& sent_packet) override;
|
||||||
void OnReceivedPacket(const ReceivedPacket& packet_msg) override;
|
|
||||||
|
|
||||||
void SetSdpBitrateParameters(const BitrateConstraints& constraints) override;
|
void SetSdpBitrateParameters(const BitrateConstraints& constraints) override;
|
||||||
void SetClientBitratePreferences(const BitrateSettings& preferences) override;
|
void SetClientBitratePreferences(const BitrateSettings& preferences) override;
|
||||||
|
|||||||
@ -32,7 +32,6 @@
|
|||||||
#include "modules/rtp_rtcp/include/rtcp_statistics.h"
|
#include "modules/rtp_rtcp/include/rtcp_statistics.h"
|
||||||
#include "modules/rtp_rtcp/include/rtp_packet_sender.h"
|
#include "modules/rtp_rtcp/include/rtp_packet_sender.h"
|
||||||
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
||||||
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
|
|
||||||
|
|
||||||
namespace rtc {
|
namespace rtc {
|
||||||
struct SentPacket;
|
struct SentPacket;
|
||||||
@ -139,8 +138,6 @@ class RtpTransportControllerSendInterface {
|
|||||||
// the calling thread or make assumptions about the thread context.
|
// the calling thread or make assumptions about the thread context.
|
||||||
virtual void OnSentPacket(const rtc::SentPacket& sent_packet) = 0;
|
virtual void OnSentPacket(const rtc::SentPacket& sent_packet) = 0;
|
||||||
|
|
||||||
virtual void OnReceivedPacket(const ReceivedPacket& received_packet) = 0;
|
|
||||||
|
|
||||||
virtual void SetSdpBitrateParameters(
|
virtual void SetSdpBitrateParameters(
|
||||||
const BitrateConstraints& constraints) = 0;
|
const BitrateConstraints& constraints) = 0;
|
||||||
virtual void SetClientBitratePreferences(
|
virtual void SetClientBitratePreferences(
|
||||||
|
|||||||
@ -98,7 +98,6 @@ class MockRtpTransportControllerSend
|
|||||||
MOCK_METHOD(void, OnTransportOverheadChanged, (size_t), (override));
|
MOCK_METHOD(void, OnTransportOverheadChanged, (size_t), (override));
|
||||||
MOCK_METHOD(void, AccountForAudioPacketsInPacedSender, (bool), (override));
|
MOCK_METHOD(void, AccountForAudioPacketsInPacedSender, (bool), (override));
|
||||||
MOCK_METHOD(void, IncludeOverheadInPacedSender, (), (override));
|
MOCK_METHOD(void, IncludeOverheadInPacedSender, (), (override));
|
||||||
MOCK_METHOD(void, OnReceivedPacket, (const ReceivedPacket&), (override));
|
|
||||||
MOCK_METHOD(void, EnsureStarted, (), (override));
|
MOCK_METHOD(void, EnsureStarted, (), (override));
|
||||||
};
|
};
|
||||||
} // namespace webrtc
|
} // namespace webrtc
|
||||||
|
|||||||
@ -240,7 +240,7 @@ NetworkControlUpdate GoogCcNetworkController::OnProcessInterval(
|
|||||||
probes.begin(), probes.end());
|
probes.begin(), probes.end());
|
||||||
|
|
||||||
if (rate_control_settings_.UseCongestionWindow() &&
|
if (rate_control_settings_.UseCongestionWindow() &&
|
||||||
last_packet_received_time_.IsFinite() && !feedback_max_rtts_.empty()) {
|
!feedback_max_rtts_.empty()) {
|
||||||
UpdateCongestionWindowSize();
|
UpdateCongestionWindowSize();
|
||||||
}
|
}
|
||||||
if (congestion_window_pushback_controller_ && current_data_window_) {
|
if (congestion_window_pushback_controller_ && current_data_window_) {
|
||||||
@ -304,12 +304,6 @@ NetworkControlUpdate GoogCcNetworkController::OnSentPacket(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkControlUpdate GoogCcNetworkController::OnReceivedPacket(
|
|
||||||
ReceivedPacket received_packet) {
|
|
||||||
last_packet_received_time_ = received_packet.receive_time;
|
|
||||||
return NetworkControlUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
NetworkControlUpdate GoogCcNetworkController::OnStreamsConfig(
|
NetworkControlUpdate GoogCcNetworkController::OnStreamsConfig(
|
||||||
StreamsConfig msg) {
|
StreamsConfig msg) {
|
||||||
NetworkControlUpdate update;
|
NetworkControlUpdate update;
|
||||||
|
|||||||
@ -63,7 +63,6 @@ class GoogCcNetworkController : public NetworkControllerInterface {
|
|||||||
NetworkControlUpdate OnRemoteBitrateReport(RemoteBitrateReport msg) override;
|
NetworkControlUpdate OnRemoteBitrateReport(RemoteBitrateReport msg) override;
|
||||||
NetworkControlUpdate OnRoundTripTimeUpdate(RoundTripTimeUpdate msg) override;
|
NetworkControlUpdate OnRoundTripTimeUpdate(RoundTripTimeUpdate msg) override;
|
||||||
NetworkControlUpdate OnSentPacket(SentPacket msg) override;
|
NetworkControlUpdate OnSentPacket(SentPacket msg) override;
|
||||||
NetworkControlUpdate OnReceivedPacket(ReceivedPacket msg) override;
|
|
||||||
NetworkControlUpdate OnStreamsConfig(StreamsConfig msg) override;
|
NetworkControlUpdate OnStreamsConfig(StreamsConfig msg) override;
|
||||||
NetworkControlUpdate OnTargetRateConstraints(
|
NetworkControlUpdate OnTargetRateConstraints(
|
||||||
TargetRateConstraints msg) override;
|
TargetRateConstraints msg) override;
|
||||||
@ -133,7 +132,6 @@ class GoogCcNetworkController : public NetworkControllerInterface {
|
|||||||
|
|
||||||
absl::optional<uint8_t> last_estimated_fraction_loss_ = 0;
|
absl::optional<uint8_t> last_estimated_fraction_loss_ = 0;
|
||||||
TimeDelta last_estimated_round_trip_time_ = TimeDelta::PlusInfinity();
|
TimeDelta last_estimated_round_trip_time_ = TimeDelta::PlusInfinity();
|
||||||
Timestamp last_packet_received_time_ = Timestamp::MinusInfinity();
|
|
||||||
|
|
||||||
double pacing_factor_;
|
double pacing_factor_;
|
||||||
DataRate min_total_allocated_bitrate_;
|
DataRate min_total_allocated_bitrate_;
|
||||||
|
|||||||
@ -377,11 +377,6 @@ NetworkControlUpdate PccNetworkController::OnStreamsConfig(StreamsConfig msg) {
|
|||||||
return NetworkControlUpdate();
|
return NetworkControlUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkControlUpdate PccNetworkController::OnReceivedPacket(
|
|
||||||
ReceivedPacket msg) {
|
|
||||||
return NetworkControlUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
NetworkControlUpdate PccNetworkController::OnNetworkStateEstimate(
|
NetworkControlUpdate PccNetworkController::OnNetworkStateEstimate(
|
||||||
NetworkStateEstimate msg) {
|
NetworkStateEstimate msg) {
|
||||||
return NetworkControlUpdate();
|
return NetworkControlUpdate();
|
||||||
|
|||||||
@ -78,7 +78,6 @@ class PccNetworkController : public NetworkControllerInterface {
|
|||||||
NetworkControlUpdate OnRemoteBitrateReport(RemoteBitrateReport msg) override;
|
NetworkControlUpdate OnRemoteBitrateReport(RemoteBitrateReport msg) override;
|
||||||
NetworkControlUpdate OnRoundTripTimeUpdate(RoundTripTimeUpdate msg) override;
|
NetworkControlUpdate OnRoundTripTimeUpdate(RoundTripTimeUpdate msg) override;
|
||||||
NetworkControlUpdate OnTransportLossReport(TransportLossReport msg) override;
|
NetworkControlUpdate OnTransportLossReport(TransportLossReport msg) override;
|
||||||
NetworkControlUpdate OnReceivedPacket(ReceivedPacket msg) override;
|
|
||||||
NetworkControlUpdate OnNetworkStateEstimate(
|
NetworkControlUpdate OnNetworkStateEstimate(
|
||||||
NetworkStateEstimate msg) override;
|
NetworkStateEstimate msg) override;
|
||||||
|
|
||||||
|
|||||||
@ -122,10 +122,6 @@ NetworkControlUpdate NetworkControleUpdateCache::OnRoundTripTimeUpdate(
|
|||||||
NetworkControlUpdate NetworkControleUpdateCache::OnSentPacket(SentPacket msg) {
|
NetworkControlUpdate NetworkControleUpdateCache::OnSentPacket(SentPacket msg) {
|
||||||
return Update(controller_->OnSentPacket(msg));
|
return Update(controller_->OnSentPacket(msg));
|
||||||
}
|
}
|
||||||
NetworkControlUpdate NetworkControleUpdateCache::OnReceivedPacket(
|
|
||||||
ReceivedPacket msg) {
|
|
||||||
return Update(controller_->OnReceivedPacket(msg));
|
|
||||||
}
|
|
||||||
NetworkControlUpdate NetworkControleUpdateCache::OnStreamsConfig(
|
NetworkControlUpdate NetworkControleUpdateCache::OnStreamsConfig(
|
||||||
StreamsConfig msg) {
|
StreamsConfig msg) {
|
||||||
return Update(controller_->OnStreamsConfig(msg));
|
return Update(controller_->OnStreamsConfig(msg));
|
||||||
|
|||||||
@ -47,7 +47,6 @@ class NetworkControleUpdateCache : public NetworkControllerInterface {
|
|||||||
NetworkControlUpdate OnRemoteBitrateReport(RemoteBitrateReport msg) override;
|
NetworkControlUpdate OnRemoteBitrateReport(RemoteBitrateReport msg) override;
|
||||||
NetworkControlUpdate OnRoundTripTimeUpdate(RoundTripTimeUpdate msg) override;
|
NetworkControlUpdate OnRoundTripTimeUpdate(RoundTripTimeUpdate msg) override;
|
||||||
NetworkControlUpdate OnSentPacket(SentPacket msg) override;
|
NetworkControlUpdate OnSentPacket(SentPacket msg) override;
|
||||||
NetworkControlUpdate OnReceivedPacket(ReceivedPacket msg) override;
|
|
||||||
NetworkControlUpdate OnStreamsConfig(StreamsConfig msg) override;
|
NetworkControlUpdate OnStreamsConfig(StreamsConfig msg) override;
|
||||||
NetworkControlUpdate OnTargetRateConstraints(
|
NetworkControlUpdate OnTargetRateConstraints(
|
||||||
TargetRateConstraints msg) override;
|
TargetRateConstraints msg) override;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user