| Index: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
|
| index 3c986e98c210e62bc171c98b13be4c6b1c51b0d9..e0bcebda158d2beaf3b22fec6b592d6a54d845a7 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
|
| @@ -211,7 +211,7 @@ void ModuleRtpRtcpImpl::Process() {
|
| if (rtcp_sender_.TimeToSendRTCPReport())
|
| rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpReport);
|
|
|
| - if (UpdateRTCPReceiveInformationTimers()) {
|
| + if (TMMBR() && rtcp_receiver_.UpdateRTCPReceiveInformationTimers()) {
|
| // A receiver has timed out.
|
| rtcp_receiver_.UpdateTmmbr();
|
| }
|
| @@ -867,12 +867,6 @@ bool ModuleRtpRtcpImpl::LastReceivedNTP(
|
| return true;
|
| }
|
|
|
| -bool ModuleRtpRtcpImpl::UpdateRTCPReceiveInformationTimers() {
|
| - // If this returns true this channel has timed out.
|
| - // Periodically check if this is true and if so call UpdateTMMBR.
|
| - return rtcp_receiver_.UpdateRTCPReceiveInformationTimers();
|
| -}
|
| -
|
| // Called from RTCPsender.
|
| std::vector<rtcp::TmmbItem> ModuleRtpRtcpImpl::BoundingSet(bool* tmmbr_owner) {
|
| return rtcp_receiver_.BoundingSet(tmmbr_owner);
|
|
|