commit 1f2209d28ccbe20f5299660f2fce527bc25e2db0
author Niels Möller <nisse@webrtc.org> Mon Dec 21 10:43:10 2020
committer Commit Bot <commit-bot@chromium.org> Mon Dec 21 11:55:46 2020
tree 0b7fd39a2db75201a245a8d1ce1c46005a08260b
parent 8649e49d10e6e6efb5a98920f0b19a77abe8f070

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

diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index b29c1d0..79f5aa6 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -435,14 +435,7 @@
     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) {