Delete vcm::VideoReceiver methods Delay and SetRenderDelay.
They are called only from VideoReceiveStream, which can access
VCMTiming directly.
Bug: webrtc:7408
Change-Id: Ibf5799b1441c00b41143342ca1d99024cb68ba17
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133569
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27700}diff --git a/modules/video_coding/video_coding_impl.h b/modules/video_coding/video_coding_impl.h
index d0a1945..c348874 100644
--- a/modules/video_coding/video_coding_impl.h
+++ b/modules/video_coding/video_coding_impl.h
@@ -77,8 +77,6 @@
int32_t IncomingPacket(const uint8_t* incomingPayload,
size_t payloadLength,
const WebRtcRTPHeader& rtpInfo);
- int32_t SetRenderDelay(uint32_t timeMS);
- int32_t Delay() const;
void SetNackSettings(size_t max_nack_list_size,
int max_packet_age_to_nack,
diff --git a/modules/video_coding/video_receiver.cc b/modules/video_coding/video_receiver.cc
index 1fd6b0b..9f62ce6 100644
--- a/modules/video_coding/video_receiver.cc
+++ b/modules/video_coding/video_receiver.cc
@@ -354,21 +354,6 @@
return VCM_OK;
}
-// The estimated delay caused by rendering, defaults to
-// kDefaultRenderDelayMs = 10 ms
-int32_t VideoReceiver::SetRenderDelay(uint32_t timeMS) {
- RTC_DCHECK_RUN_ON(&construction_thread_checker_);
- RTC_DCHECK(!IsDecoderThreadRunning());
- _timing->set_render_delay(timeMS);
- return VCM_OK;
-}
-
-// Current video delay
-int32_t VideoReceiver::Delay() const {
- RTC_DCHECK_RUN_ON(&module_thread_checker_);
- return _timing->TargetVideoDelay();
-}
-
void VideoReceiver::SetNackSettings(size_t max_nack_list_size,
int max_packet_age_to_nack,
int max_incomplete_time_ms) {
diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index 4aaa886..d885b0b 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -239,7 +239,7 @@
decoder_payload_types.insert(decoder.payload_type);
}
- video_receiver_.SetRenderDelay(config_.render_delay_ms);
+ timing_->set_render_delay(config_.render_delay_ms);
jitter_estimator_.reset(new VCMJitterEstimator(clock_));
frame_buffer_.reset(new video_coding::FrameBuffer(
@@ -579,7 +579,7 @@
if (!info)
return absl::nullopt;
- info->current_delay_ms = video_receiver_.Delay();
+ info->current_delay_ms = timing_->TargetVideoDelay();
return info;
}