commit 4abca6699def3d223bd95fe7e7cf111a9d074878
author Per K <perkj@webrtc.org> Thu Jan 19 14:11:07 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jan 19 15:27:33 2023
tree 6ce6452514f73473eebaa5a74147ce8e55e9c02a
parent 9f9671fe7fa63738d564adbf94e8863597b6ac0b

Ensure FakeNetwork propages arrival_time

Bug: webrtc:14833
Change-Id: I584524cca81e17ac91d581daab6030705ad68dac
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291104
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Auto-Submit: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Per Kjellander <perkj@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39148}

call/BUILD.gn

diff --git a/call/BUILD.gn b/call/BUILD.gn
index fd4b111..f4c3295 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -670,6 +670,7 @@
       "../api:simulated_network_api",
       "../api/units:data_rate",
       "../api/units:time_delta",
+      "../api/units:timestamp",
       "../modules/rtp_rtcp:rtp_rtcp_format",
       "../rtc_base:checks",
       "../system_wrappers",

call/fake_network_pipe.h

diff --git a/call/fake_network_pipe.h b/call/fake_network_pipe.h
index 198615c..2649a00 100644
--- a/call/fake_network_pipe.h
+++ b/call/fake_network_pipe.h
@@ -70,6 +70,9 @@
   bool is_rtcp() const { return is_rtcp_; }
   MediaType media_type() const { return media_type_; }
   absl::optional<int64_t> packet_time_us() const { return packet_time_us_; }
+  RtpPacketReceived* packet_received() {
+    return packet_received_ ? &packet_received_.value() : nullptr;
+  }
   absl::optional<RtpPacketReceived> packet_received() const {
     return packet_received_;
   }

call/fake_network_pipe_unittest.cc

diff --git a/call/fake_network_pipe_unittest.cc b/call/fake_network_pipe_unittest.cc
index 9c4e6d9..d3f7734 100644
--- a/call/fake_network_pipe_unittest.cc
+++ b/call/fake_network_pipe_unittest.cc
@@ -13,6 +13,8 @@
 #include <memory>
 #include <utility>
 
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 #include "call/simulated_network.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/source/rtp_header_extensions.h"
@@ -441,6 +443,30 @@
   pipe->Process();
 }
 
+TEST_F(FakeNetworkPipeTest, DeliverRtpPacketSetsCorrectArrivalTime) {
+  BuiltInNetworkBehaviorConfig config;
+  config.queue_delay_ms = 100;
+  MockReceiver receiver;
+  auto simulated_network = std::make_unique<SimulatedNetwork>(config);
+  std::unique_ptr<FakeNetworkPipe> pipe(new FakeNetworkPipe(
+      &fake_clock_, std::move(simulated_network), &receiver));
+
+  Timestamp send_time = fake_clock_.CurrentTime();
+  RtpPacketReceived packet(nullptr, send_time);
+  packet.SetExtension<TransportSequenceNumber>(123);
+  pipe->DeliverRtpPacket(MediaType::VIDEO, std::move(packet),
+                         [](const RtpPacketReceived&) { return false; });
+
+  // Advance the network delay to get the first packet.
+  fake_clock_.AdvanceTimeMilliseconds(config.queue_delay_ms);
+  EXPECT_CALL(receiver, DeliverRtpPacket(MediaType::VIDEO, _, _))
+      .WillOnce(WithArg<1>([&](RtpPacketReceived packet) {
+        EXPECT_EQ(packet.arrival_time(),
+                  send_time + TimeDelta::Millis(config.queue_delay_ms));
+      }));
+  pipe->Process();
+}
+
 TEST_F(FakeNetworkPipeTest, DeliverRtpPacketPropagatesExtensions) {
   BuiltInNetworkBehaviorConfig config;
   config.queue_delay_ms = 100;