mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Delete vcm::VideoReceiver methods Delay and SetRenderDelay.

Browse source 
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}
This commit is contained in:
Niels Möller 2019-04-18 12:54:04 +02:00 committed by Commit Bot
parent 37242cbc41
commit bcb7c209d4
3 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/video_coding/video_coding_impl.h
View file

@ -77,8 +77,6 @@ class VideoReceiver : public Module {
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,

15
modules/video_coding/video_receiver.cc
View file

@ -354,21 +354,6 @@ int32_t VideoReceiver::IncomingPacket(const uint8_t* incomingPayload,
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) {

4
video/video_receive_stream.cc
View file

@ -239,7 +239,7 @@ VideoReceiveStream::VideoReceiveStream(
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 @@ absl::optional<Syncable::Info> VideoReceiveStream::GetInfo() const {
if (!info)
return absl::nullopt;
info->current_delay_ms = video_receiver_.Delay();
info->current_delay_ms = timing_->TargetVideoDelay();
return info;
}