| Index: webrtc/voice_engine/channel.cc
|
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
|
| index 1ab69714f7962a746e99d2f13058a451efed3f71..24df17d88acb40fc4fbd8ed26a6d7226a14f49a2 100644
|
| --- a/webrtc/voice_engine/channel.cc
|
| +++ b/webrtc/voice_engine/channel.cc
|
| @@ -2417,28 +2417,34 @@ void Channel::RegisterSenderCongestionControlObjects(
|
| seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router);
|
| rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender);
|
| _rtpRtcpModule->SetStorePacketsStatus(true, 600);
|
| - packet_router->AddRtpModule(_rtpRtcpModule.get());
|
| + packet_router->AddSendRtpModule(_rtpRtcpModule.get());
|
| packet_router_ = packet_router;
|
| }
|
|
|
| void Channel::RegisterReceiverCongestionControlObjects(
|
| PacketRouter* packet_router) {
|
| RTC_DCHECK(packet_router && !packet_router_);
|
| - packet_router->AddRtpModule(_rtpRtcpModule.get());
|
| + packet_router->AddReceiveRtpModule(_rtpRtcpModule.get());
|
| packet_router_ = packet_router;
|
| }
|
|
|
| -void Channel::ResetCongestionControlObjects() {
|
| +void Channel::ResetSenderCongestionControlObjects() {
|
| RTC_DCHECK(packet_router_);
|
| _rtpRtcpModule->SetStorePacketsStatus(false, 600);
|
| rtcp_observer_->SetBandwidthObserver(nullptr);
|
| feedback_observer_proxy_->SetTransportFeedbackObserver(nullptr);
|
| seq_num_allocator_proxy_->SetSequenceNumberAllocator(nullptr);
|
| - packet_router_->RemoveRtpModule(_rtpRtcpModule.get());
|
| + packet_router_->RemoveSendRtpModule(_rtpRtcpModule.get());
|
| packet_router_ = nullptr;
|
| rtp_packet_sender_proxy_->SetPacketSender(nullptr);
|
| }
|
|
|
| +void Channel::ResetReceiverCongestionControlObjects() {
|
| + RTC_DCHECK(packet_router_);
|
| + packet_router_->RemoveReceiveRtpModule(_rtpRtcpModule.get());
|
| + packet_router_ = nullptr;
|
| +}
|
| +
|
| void Channel::SetRTCPStatus(bool enable) {
|
| WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
|
| "Channel::SetRTCPStatus()");
|
|
|