commit 92e89d7f77bf637538abb1f9f898de87d3c2edaa
author Evan Shrubsole <eshr@webrtc.org> Tue Mar 22 10:55:15 2022 +0100
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 22 15:15:13 2022 +0000
tree e7e722b5d1340f5fffa0937ba3a9330102f904bc
parent 6ceb81f62b5216f4378601483b423ec9de1a0355

[cleanup] Return struct from VCMTiming::GetTimings

Cleans callers having to initialize TimeDeltas.

Change-Id: Ib00a59bedf05fb82c9fde1d9fdd1e341e2132cb8
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256360
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36292}

modules/video_coding/frame_buffer2_unittest.cc

diff --git a/modules/video_coding/frame_buffer2_unittest.cc b/modules/video_coding/frame_buffer2_unittest.cc
index 4811635..d8ba863 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -65,25 +65,8 @@
     return render_time - now - kDecodeTime;
   }
 
-  bool GetTimings(TimeDelta* max_decode,
-                  TimeDelta* current_delay,
-                  TimeDelta* target_delay,
-                  TimeDelta* jitter_buffer,
-                  TimeDelta* min_playout_delay,
-                  TimeDelta* render_delay) const override {
-    return true;
-  }
-
   TimeDelta GetCurrentJitter() {
-    TimeDelta max_decode = TimeDelta::Zero();
-    TimeDelta current_delay = TimeDelta::Zero();
-    TimeDelta target_delay = TimeDelta::Zero();
-    TimeDelta jitter_buffer = TimeDelta::Zero();
-    TimeDelta min_playout_delay = TimeDelta::Zero();
-    TimeDelta render_delay = TimeDelta::Zero();
-    VCMTiming::GetTimings(&max_decode, &current_delay, &target_delay,
-                          &jitter_buffer, &min_playout_delay, &render_delay);
-    return jitter_buffer;
+    return VCMTiming::GetTimings().jitter_buffer_delay;
   }
 
  private:
@@ -538,6 +521,8 @@
   EXPECT_CALL(stats_callback_,
               OnCompleteFrame(true, kFrameSize, VideoContentType::UNSPECIFIED));
   EXPECT_CALL(stats_callback_, OnFrameBufferTimingsUpdated(_, _, _, _, _, _));
+  // Stats callback requires a previously decoded frame.
+  timing_.StopDecodeTimer(TimeDelta::Millis(1), Timestamp::Zero());
 
   {
     std::unique_ptr<FrameObjectFake> frame(new FrameObjectFake());