Remove time constraint on first retransmit of a packet.

webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  * This file includes unit tests for the RTPPacketHistory.
@@ skipping 143 matching lines @@
 
   size_t len_out = kMaxPacketLength;
   int64_t time;
   EXPECT_TRUE(hist_->GetPacketAndSetSendTime(kSeqNum, 0, false, packet_out_,
                                              &len_out, &time));
   EXPECT_EQ(len, len_out);
   EXPECT_EQ(capture_time_ms, time);
 }
 
 TEST_F(RtpPacketHistoryTest, MinResendTime) {
+  static const int64_t kMinRetransmitIntervalMs = 100;
+
   hist_->SetStorePacketsStatus(true, 10);
   size_t len = 0;
   int64_t capture_time_ms = fake_clock_.TimeInMilliseconds();
   CreateRtpPacket(kSeqNum, kSsrc, kPayload, kTimestamp, packet_, &len);
   EXPECT_EQ(0, hist_->PutRTPPacket(packet_, len, capture_time_ms,
                                    kAllowRetransmission));
 
+  // First transmission: TimeToSendPacket() call from pacer.
   int64_t time;
   len = kMaxPacketLength;
-  EXPECT_TRUE(hist_->GetPacketAndSetSendTime(kSeqNum, 100, false, packet_, &len,
-                                             &time));
-  fake_clock_.AdvanceTimeMilliseconds(100);
+  EXPECT_TRUE(
+      hist_->GetPacketAndSetSendTime(kSeqNum, 0, false, packet_, &len, &time));
+
+  fake_clock_.AdvanceTimeMilliseconds(kMinRetransmitIntervalMs);
   // Time has elapsed.
   len = kMaxPacketLength;
-  EXPECT_TRUE(hist_->GetPacketAndSetSendTime(kSeqNum, 100, false, packet_, &len,
-                                             &time));
+  EXPECT_TRUE(hist_->GetPacketAndSetSendTime(kSeqNum, kMinRetransmitIntervalMs,
+                                             true, packet_, &len, &time));
   EXPECT_GT(len, 0u);
   EXPECT_EQ(capture_time_ms, time);
 
+  fake_clock_.AdvanceTimeMilliseconds(kMinRetransmitIntervalMs - 1);
   // Time has not elapsed. Packet should be found, but no bytes copied.
   len = kMaxPacketLength;
-  EXPECT_FALSE(hist_->GetPacketAndSetSendTime(kSeqNum, 101, false, packet_,
-                                              &len, &time));
+  EXPECT_FALSE(hist_->GetPacketAndSetSendTime(kSeqNum, kMinRetransmitIntervalMs,
+                                              true, packet_, &len, &time));
+}
+
+TEST_F(RtpPacketHistoryTest, EarlyFirstResend) {
+  static const int64_t kMinRetransmitIntervalMs = 100;
+
+  hist_->SetStorePacketsStatus(true, 10);
+  size_t len = 0;
+  int64_t capture_time_ms = fake_clock_.TimeInMilliseconds();
+  CreateRtpPacket(kSeqNum, kSsrc, kPayload, kTimestamp, packet_, &len);
+  EXPECT_EQ(0, hist_->PutRTPPacket(packet_, len, capture_time_ms,
+                                   kAllowRetransmission));
+
+  // First transmission: TimeToSendPacket() call from pacer.
+  int64_t time;
+  len = kMaxPacketLength;
+  EXPECT_TRUE(
+      hist_->GetPacketAndSetSendTime(kSeqNum, 0, false, packet_, &len, &time));
+
+  fake_clock_.AdvanceTimeMilliseconds(kMinRetransmitIntervalMs - 1);
+  // Time has not elapsed, but this is the first retransmission request so
+  // allow anyway.
+  len = kMaxPacketLength;
+  EXPECT_TRUE(hist_->GetPacketAndSetSendTime(kSeqNum, kMinRetransmitIntervalMs,
+                                             true, packet_, &len, &time));
+  EXPECT_GT(len, 0u);
+  EXPECT_EQ(capture_time_ms, time);
+
+  fake_clock_.AdvanceTimeMilliseconds(kMinRetransmitIntervalMs - 1);
+  // Time has not elapsed. Packet should be found, but no bytes copied.
+  len = kMaxPacketLength;
+  EXPECT_FALSE(hist_->GetPacketAndSetSendTime(kSeqNum, kMinRetransmitIntervalMs,
+                                              true, packet_, &len, &time));
 }
 
 TEST_F(RtpPacketHistoryTest, DynamicExpansion) {
   hist_->SetStorePacketsStatus(true, 10);
   size_t len;
   int64_t capture_time_ms = fake_clock_.TimeInMilliseconds();
   int64_t time;
 
   // Add 4 packets, and then send them.
   for (int i = 0; i < 4; ++i) {
@@ skipping 49 matching lines @@
 
   // Retransmit all packets currently in buffer.
   for (size_t i = 1; i < kMaxHistoryCapacity + 1; ++i) {
     len = kMaxPacketLength;
     EXPECT_TRUE(hist_->GetPacketAndSetSendTime(kSeqNum + i, 100, false, packet_,
                                                &len, &time));
   }
 }
 
 }  // namespace webrtc