commit bfd343b9bee8fe54ca862da5f66450cf08ca0348
author Johannes Kron <kron@webrtc.org> Mon Jul 01 10:07:50 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Jul 02 08:28:06 2019 +0000
tree 4d0910354ac4ca5ead06cf5e2df0a766fec104d9
parent 419aae2ed3313e215f2b7dafe5a40e3f0f798298

Add totalDecodeTime to RTCInboundRTPStreamStats

Pull request to WebRTC stats specification:
https://github.com/w3c/webrtc-stats/pull/450

Bug: webrtc:10775
Change-Id: Id032cb324724329fee284ebc84595b9c39208ab8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144035
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28440}

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 083b89b..3182579 100644
--- a/modules/video_coding/frame_buffer2_unittest.cc
+++ b/modules/video_coding/frame_buffer2_unittest.cc
@@ -59,8 +59,7 @@
     return render_time_ms - now_ms - kDecodeTime;
   }
 
-  bool GetTimings(int* decode_ms,
-                  int* max_decode_ms,
+  bool GetTimings(int* max_decode_ms,
                   int* current_delay_ms,
                   int* target_delay_ms,
                   int* jitter_buffer_ms,
@@ -70,16 +69,15 @@
   }
 
   int GetCurrentJitter() {
-    int decode_ms;
     int max_decode_ms;
     int current_delay_ms;
     int target_delay_ms;
     int jitter_buffer_ms;
     int min_playout_delay_ms;
     int render_delay_ms;
-    VCMTiming::GetTimings(&decode_ms, &max_decode_ms, &current_delay_ms,
-                          &target_delay_ms, &jitter_buffer_ms,
-                          &min_playout_delay_ms, &render_delay_ms);
+    VCMTiming::GetTimings(&max_decode_ms, &current_delay_ms, &target_delay_ms,
+                          &jitter_buffer_ms, &min_playout_delay_ms,
+                          &render_delay_ms);
     return jitter_buffer_ms;
   }
 
@@ -115,9 +113,8 @@
                     VideoContentType content_type));
   MOCK_METHOD1(OnDiscardedPacketsUpdated, void(int discarded_packets));
   MOCK_METHOD1(OnFrameCountsUpdated, void(const FrameCounts& frame_counts));
-  MOCK_METHOD7(OnFrameBufferTimingsUpdated,
-               void(int decode_ms,
-                    int max_decode_ms,
+  MOCK_METHOD6(OnFrameBufferTimingsUpdated,
+               void(int max_decode_ms,
                     int current_delay_ms,
                     int target_delay_ms,
                     int jitter_buffer_ms,
@@ -548,8 +545,7 @@
 
   EXPECT_CALL(stats_callback_,
               OnCompleteFrame(true, kFrameSize, VideoContentType::UNSPECIFIED));
-  EXPECT_CALL(stats_callback_,
-              OnFrameBufferTimingsUpdated(_, _, _, _, _, _, _));
+  EXPECT_CALL(stats_callback_, OnFrameBufferTimingsUpdated(_, _, _, _, _, _));
 
   {
     std::unique_ptr<FrameObjectFake> frame(new FrameObjectFake());