commit e9126c18bfc98041bec8e7e1017552565f7b5bc4
author Evan Shrubsole <eshr@webrtc.org> Mon Mar 07 13:50:51 2022
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 08 09:05:12 2022
tree 6974ffc014dac0129c3aad6560666426e2aaee75
parent 773205dfb25ff71919c14a3e2b4bc6239b8afe9a

Migrate VCMInterFrameDelay to use Time units

Additionally,
* Moved to its own GN target.
* Added unittests.
* Removed unused variable `_zeroWallClock`.
* Renamed variables to match style guide.
* Moved fields _dTS and _wrapArounds to variables.

Change-Id: I7aa8b8dec55abab49ceabe838dabf2a7e13d685d
Bug: webrtc:13756
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/253580
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36147}

video/BUILD.gn

diff --git a/video/BUILD.gn b/video/BUILD.gn
index e5ba48b..8dcef1a 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -100,6 +100,7 @@
     "../modules/video_coding:codec_globals_headers",
     "../modules/video_coding:frame_buffer",
     "../modules/video_coding:frame_helpers",
+    "../modules/video_coding:inter_frame_delay",
     "../modules/video_coding:jitter_estimator",
     "../modules/video_coding:nack_requester",
     "../modules/video_coding:packet_buffer",

video/frame_buffer_proxy.cc

diff --git a/video/frame_buffer_proxy.cc b/video/frame_buffer_proxy.cc
index c7fce7a..2ec3ac4 100644
--- a/video/frame_buffer_proxy.cc
+++ b/video/frame_buffer_proxy.cc
@@ -149,7 +149,7 @@
         contentType(frame.contentType()),
         delayed_by_retransmission(frame.delayed_by_retransmission()),
         rtp_timestamp(frame.Timestamp()),
-        receive_time_ms(frame.ReceivedTime()) {}
+        receive_time(frame.ReceivedTimestamp()) {}
 
   const bool is_last_spatial_layer;
   const bool is_keyframe;
@@ -157,9 +157,15 @@
   const VideoContentType contentType;
   const bool delayed_by_retransmission;
   const uint32_t rtp_timestamp;
-  const int64_t receive_time_ms;
+  const absl::optional<Timestamp> receive_time;
 };
 
+Timestamp ReceiveTime(const EncodedFrame& frame) {
+  absl::optional<Timestamp> ts = frame.ReceivedTimestamp();
+  RTC_DCHECK(ts.has_value()) << "Received frame must have a timestamp set!";
+  return *ts;
+}
+
 // Encapsulates use of the new frame buffer for use in VideoReceiveStream. This
 // behaves the same as the FrameBuffer2Proxy but uses frame_buffer3 instead.
 // Responsibilities from frame_buffer2, like stats, jitter and frame timing
@@ -186,7 +192,6 @@
         timing_(timing),
         frame_decode_scheduler_(std::move(frame_decode_scheduler)),
         jitter_estimator_(clock_),
-        inter_frame_delay_(clock_->TimeInMilliseconds()),
         buffer_(std::make_unique<FrameBuffer>(kMaxFramesBuffered,
                                               kMaxFramesHistory)),
         decode_timing_(clock_, timing_),
@@ -248,12 +253,10 @@
     if (complete_units < buffer_->GetTotalNumberOfContinuousTemporalUnits()) {
       stats_proxy_->OnCompleteFrame(metadata.is_keyframe, metadata.size,
                                     metadata.contentType);
-      RTC_DCHECK_GE(metadata.receive_time_ms, 0)
-          << "Frame receive time must be positive for received frames, was "
-          << metadata.receive_time_ms << ".";
-      if (!metadata.delayed_by_retransmission && metadata.receive_time_ms >= 0)
+      RTC_DCHECK(metadata.receive_time) << "Frame receive time must be set!";
+      if (!metadata.delayed_by_retransmission && metadata.receive_time)
         timing_->IncomingTimestamp(metadata.rtp_timestamp,
-                                   Timestamp::Millis(metadata.receive_time_ms));
+                                   *metadata.receive_time);
       MaybeScheduleFrameForRelease();
     }
 
@@ -301,7 +304,7 @@
     bool superframe_delayed_by_retransmission = false;
     DataSize superframe_size = DataSize::Zero();
     const EncodedFrame& first_frame = *frames.front();
-    int64_t receive_time_ms = first_frame.ReceivedTime();
+    Timestamp receive_time = ReceiveTime(first_frame);
 
     if (first_frame.is_keyframe())
       keyframe_required_ = false;
@@ -319,17 +322,15 @@
 
       superframe_delayed_by_retransmission |=
           frame->delayed_by_retransmission();
-      receive_time_ms = std::max(receive_time_ms, frame->ReceivedTime());
+      receive_time = std::max(receive_time, ReceiveTime(*frame));
       superframe_size += DataSize::Bytes(frame->size());
     }
 
     if (!superframe_delayed_by_retransmission) {
-      int64_t frame_delay;
-
-      if (inter_frame_delay_.CalculateDelay(first_frame.Timestamp(),
-                                            &frame_delay, receive_time_ms)) {
-        jitter_estimator_.UpdateEstimate(TimeDelta::Millis(frame_delay),
-                                         superframe_size);
+      auto frame_delay = inter_frame_delay_.CalculateDelay(
+          first_frame.Timestamp(), receive_time);
+      if (frame_delay) {
+        jitter_estimator_.UpdateEstimate(*frame_delay, superframe_size);
       }
 
       float rtt_mult = protection_mode_ == kProtectionNackFEC ? 0.0 : 1.0;