Delete VCMJitterBuffer::UpdateRtt and related unused code

Bug: webrtc:7408
Change-Id: Ic4bd745ed36dd7f7d5eec6531e05204035a545fd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133188
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27648}
This commit is contained in:
Niels Möller
2019-04-16 16:11:09 +02:00
committed by Commit Bot
parent 034f1916b5
commit 50150a18f4
6 changed files with 1 additions and 25 deletions

View File

@ -128,7 +128,6 @@ VCMJitterBuffer::VCMJitterBuffer(Clock* clock,
num_duplicated_packets_(0), num_duplicated_packets_(0),
jitter_estimate_(clock), jitter_estimate_(clock),
inter_frame_delay_(clock_->TimeInMilliseconds()), inter_frame_delay_(clock_->TimeInMilliseconds()),
rtt_ms_(kDefaultRtt),
missing_sequence_numbers_(SequenceNumberLessThan()), missing_sequence_numbers_(SequenceNumberLessThan()),
latest_received_sequence_number_(0), latest_received_sequence_number_(0),
max_nack_list_size_(0), max_nack_list_size_(0),
@ -169,7 +168,6 @@ void VCMJitterBuffer::Start() {
waiting_for_completion_.timestamp = 0; waiting_for_completion_.timestamp = 0;
waiting_for_completion_.latest_packet_time = -1; waiting_for_completion_.latest_packet_time = -1;
first_packet_since_reset_ = true; first_packet_since_reset_ = true;
rtt_ms_ = kDefaultRtt;
last_decoded_state_.Reset(); last_decoded_state_.Reset();
decodable_frames_.Reset(&free_frames_); decodable_frames_.Reset(&free_frames_);
@ -434,7 +432,7 @@ VCMFrameBufferEnum VCMJitterBuffer::InsertPacket(const VCMPacket& packet,
VCMFrameBufferStateEnum previous_state = frame->GetState(); VCMFrameBufferStateEnum previous_state = frame->GetState();
// Insert packet. // Insert packet.
FrameData frame_data; FrameData frame_data;
frame_data.rtt_ms = rtt_ms_; frame_data.rtt_ms = kDefaultRtt;
frame_data.rolling_average_packets_per_frame = average_packets_per_frame_; frame_data.rolling_average_packets_per_frame = average_packets_per_frame_;
VCMFrameBufferEnum buffer_state = VCMFrameBufferEnum buffer_state =
frame->InsertPacket(packet, now_ms, frame_data); frame->InsertPacket(packet, now_ms, frame_data);
@ -587,12 +585,6 @@ uint32_t VCMJitterBuffer::EstimatedJitterMs() {
return jitter_estimate_.GetJitterEstimate(rtt_mult); return jitter_estimate_.GetJitterEstimate(rtt_mult);
} }
void VCMJitterBuffer::UpdateRtt(int64_t rtt_ms) {
rtc::CritScope cs(&crit_sect_);
rtt_ms_ = rtt_ms;
jitter_estimate_.UpdateRtt(rtt_ms);
}
void VCMJitterBuffer::SetNackSettings(size_t max_nack_list_size, void VCMJitterBuffer::SetNackSettings(size_t max_nack_list_size,
int max_packet_age_to_nack, int max_packet_age_to_nack,
int max_incomplete_time_ms) { int max_incomplete_time_ms) {

View File

@ -118,9 +118,6 @@ class VCMJitterBuffer {
// Returns the estimated jitter in milliseconds. // Returns the estimated jitter in milliseconds.
uint32_t EstimatedJitterMs(); uint32_t EstimatedJitterMs();
// Updates the round-trip time estimate.
void UpdateRtt(int64_t rtt_ms);
void SetNackSettings(size_t max_nack_list_size, void SetNackSettings(size_t max_nack_list_size,
int max_packet_age_to_nack, int max_packet_age_to_nack,
int max_incomplete_time_ms); int max_incomplete_time_ms);
@ -255,7 +252,6 @@ class VCMJitterBuffer {
// Calculates network delays used for jitter calculations. // Calculates network delays used for jitter calculations.
VCMInterFrameDelay inter_frame_delay_; VCMInterFrameDelay inter_frame_delay_;
VCMJitterSample waiting_for_completion_; VCMJitterSample waiting_for_completion_;
int64_t rtt_ms_;
// Holds the internal NACK list (the missing sequence numbers). // Holds the internal NACK list (the missing sequence numbers).
SequenceNumberSet missing_sequence_numbers_; SequenceNumberSet missing_sequence_numbers_;

View File

@ -61,10 +61,6 @@ void VCMReceiver::Reset() {
} }
} }
void VCMReceiver::UpdateRtt(int64_t rtt) {
jitter_buffer_.UpdateRtt(rtt);
}
int32_t VCMReceiver::InsertPacket(const VCMPacket& packet) { int32_t VCMReceiver::InsertPacket(const VCMPacket& packet) {
// Insert the packet into the jitter buffer. The packet can either be empty or // Insert the packet into the jitter buffer. The packet can either be empty or
// contain media at this point. // contain media at this point.

View File

@ -43,7 +43,6 @@ class VCMReceiver {
~VCMReceiver(); ~VCMReceiver();
void Reset(); void Reset();
void UpdateRtt(int64_t rtt);
int32_t InsertPacket(const VCMPacket& packet); int32_t InsertPacket(const VCMPacket& packet);
VCMEncodedFrame* FrameForDecoding(uint16_t max_wait_time_ms, VCMEncodedFrame* FrameForDecoding(uint16_t max_wait_time_ms,
bool prefer_late_decoding); bool prefer_late_decoding);

View File

@ -84,7 +84,6 @@ class VideoReceiver : public Module {
int max_packet_age_to_nack, int max_packet_age_to_nack,
int max_incomplete_time_ms); int max_incomplete_time_ms);
int32_t SetReceiveChannelParameters(int64_t rtt);
int64_t TimeUntilNextProcess() override; int64_t TimeUntilNextProcess() override;
void Process() override; void Process() override;
void ProcessThreadAttached(ProcessThread* process_thread) override; void ProcessThreadAttached(ProcessThread* process_thread) override;

View File

@ -135,12 +135,6 @@ int64_t VideoReceiver::TimeUntilNextProcess() {
return timeUntilNextProcess; return timeUntilNextProcess;
} }
int32_t VideoReceiver::SetReceiveChannelParameters(int64_t rtt) {
RTC_DCHECK_RUN_ON(&module_thread_checker_);
_receiver.UpdateRtt(rtt);
return 0;
}
// Register a receive callback. Will be called whenever there is a new frame // Register a receive callback. Will be called whenever there is a new frame
// ready for rendering. // ready for rendering.
int32_t VideoReceiver::RegisterReceiveCallback( int32_t VideoReceiver::RegisterReceiveCallback(