Chromium Code Reviews| Index: webrtc/video_engine/vie_channel.cc |
| diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc |
| index 147ecb1456764e0b97d78b4cdbb771e44874c4d1..54af3dfca5cae7bacb1bde364f0f30d8deb966e5 100644 |
| --- a/webrtc/video_engine/vie_channel.cc |
| +++ b/webrtc/video_engine/vie_channel.cc |
| @@ -429,16 +429,9 @@ int32_t ViEChannel::SetReceiveCodec(const VideoCodec& video_codec) { |
| int32_t ViEChannel::RegisterExternalDecoder(const uint8_t pl_type, |
|
pbos-webrtc
2015/11/05 17:47:30
I think you can make this void and CHECK that this
|
| - VideoDecoder* decoder, |
| - bool buffered_rendering, |
| - int32_t render_delay) { |
| + VideoDecoder* decoder) { |
| RTC_DCHECK(!sender_); |
| - int32_t result; |
| - result = vcm_->RegisterExternalDecoder(decoder, pl_type, buffered_rendering); |
| - if (result != VCM_OK) { |
| - return result; |
| - } |
| - return vcm_->SetRenderDelay(render_delay); |
| + return vcm_->RegisterExternalDecoder(decoder, pl_type); |
| } |
| int32_t ViEChannel::DeRegisterExternalDecoder(const uint8_t pl_type) { |
| @@ -446,7 +439,7 @@ int32_t ViEChannel::DeRegisterExternalDecoder(const uint8_t pl_type) { |
| VideoCodec current_receive_codec; |
| int32_t result = 0; |
| result = vcm_->ReceiveCodec(¤t_receive_codec); |
| - if (vcm_->RegisterExternalDecoder(NULL, pl_type, false) != VCM_OK) { |
| + if (vcm_->RegisterExternalDecoder(NULL, pl_type) != VCM_OK) { |
| return -1; |
| } |
| @@ -473,6 +466,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); |