From 1f2209d28ccbe20f5299660f2fce527bc25e2db0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Mon, 21 Dec 2020 11:43:10 +0100
Subject: [PATCH] Delete unneeded and incorrect logic for 32-bit time wrap
 around

The RTCP next send time has used a 64-bit type since
https://webrtc-codereview.appspot.com/678011 (2012).

Bug: None
Change-Id: Ie570e9b82d71d9d8d56af91478741226d73e090e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/198541
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32868}
---
 modules/rtp_rtcp/source/rtcp_sender.cc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index b29c1d03f3..79f5aa6c67 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -435,14 +435,7 @@ bool RTCPSender::TimeToSendRTCPReport(bool sendKeyframeBeforeRTP) const {
     now += RTCP_SEND_BEFORE_KEY_FRAME_MS;
   }
 
-  if (now >= next_time_to_send_rtcp_) {
-    return true;
-  } else if (now < 0x0000ffff &&
-             next_time_to_send_rtcp_ > 0xffff0000) {  // 65 sec margin
-    // wrap
-    return true;
-  }
-  return false;
+  return now >= next_time_to_send_rtcp_;
 }
 
 std::unique_ptr<rtcp::RtcpPacket> RTCPSender::BuildSR(const RtcpContext& ctx) {