| Index: webrtc/video_engine/vie_channel.cc
|
| diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc
|
| index 681f72cc06bde2f4d5d2f487f76d2d96a0a30d4f..9f3d5195454b865a07907a04b47dfc8f6ad1003a 100644
|
| --- a/webrtc/video_engine/vie_channel.cc
|
| +++ b/webrtc/video_engine/vie_channel.cc
|
| @@ -430,14 +430,10 @@ int32_t ViEChannel::SetReceiveCodec(const VideoCodec& video_codec) {
|
| return 0;
|
| }
|
|
|
| -
|
| -int32_t ViEChannel::RegisterExternalDecoder(const uint8_t pl_type,
|
| - VideoDecoder* decoder,
|
| - bool buffered_rendering,
|
| - int32_t render_delay) {
|
| +void ViEChannel::RegisterExternalDecoder(const uint8_t pl_type,
|
| + VideoDecoder* decoder) {
|
| RTC_DCHECK(!sender_);
|
| - vcm_->RegisterExternalDecoder(decoder, pl_type, buffered_rendering);
|
| - return vcm_->SetRenderDelay(render_delay);
|
| + vcm_->RegisterExternalDecoder(decoder, pl_type);
|
| }
|
|
|
| int32_t ViEChannel::ReceiveCodecStatistics(uint32_t* num_key_frames,
|
| @@ -456,6 +452,10 @@ int ViEChannel::ReceiveDelay() const {
|
| return vcm_->Delay();
|
| }
|
|
|
| +void ViEChannel::SetExpectedRenderDelay(int32_t delay_ms) {
|
| + vcm_->SetRenderDelay(delay_ms);
|
| +}
|
| +
|
| void ViEChannel::SetRTCPMode(const RtcpMode rtcp_mode) {
|
| for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
|
| rtp_rtcp->SetRTCPStatus(rtcp_mode);
|
|
|