commit e618cc9c1ed030f33dd54396d04141b66dd24f97
author Artem Titov <titovartem@webrtc.org> Wed Mar 11 11:18:54 2020 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Mar 11 12:08:32 2020 +0000
tree 712be5c4e5d62dd2360680316aa7ef1f7d4efed4
parent c46385c346d5a98b83ecef16bd4b4aa219a61d71

Add jitterBufferTargetDelay as RTCNonStandardStatsMember to new GetStats API

Bug: webrtc:11381
Change-Id: I7df3450e50da49d178e1e3a5d9f4970672d91aac
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169120
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30758}

modules/audio_coding/neteq/neteq_unittest.cc

diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index 701a3c5..d78e2c6 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -986,6 +986,7 @@
   int packets_sent = 0;
   int packets_received = 0;
   int expected_delay = 0;
+  int expected_target_delay = 0;
   uint64_t expected_emitted_count = 0;
   while (packets_received < kNumPackets) {
     // Insert packet.
@@ -1010,6 +1011,7 @@
       // number of samples that are sent for play out.
       int current_delay_ms = packets_delay * kPacketLenMs;
       expected_delay += current_delay_ms * kSamples;
+      expected_target_delay += neteq_->TargetDelayMs() * kSamples;
       expected_emitted_count += kSamples;
     }
   }
@@ -1021,8 +1023,11 @@
 
   // Check jitter buffer delay.
   NetEqLifetimeStatistics stats = neteq_->GetLifetimeStatistics();
-  EXPECT_EQ(expected_delay, static_cast<int>(stats.jitter_buffer_delay_ms));
+  EXPECT_EQ(expected_delay,
+            rtc::checked_cast<int>(stats.jitter_buffer_delay_ms));
   EXPECT_EQ(expected_emitted_count, stats.jitter_buffer_emitted_count);
+  EXPECT_EQ(expected_target_delay,
+            rtc::checked_cast<int>(stats.jitter_buffer_target_delay_ms));
 }
 
 TEST_F(NetEqDecodingTestFaxMode, TestJitterBufferDelayWithoutLoss) {
@@ -1043,6 +1048,7 @@
   rtp_info.markerBit = 0;
   const uint8_t payload[kPayloadBytes] = {0};
 
+  int expected_target_delay = neteq_->TargetDelayMs() * kSamples;
   neteq_->InsertPacket(rtp_info, payload);
 
   bool muted;
@@ -1055,6 +1061,7 @@
   rtp_info.timestamp += kSamples;
   neteq_->InsertPacket(rtp_info, payload);
 
+  expected_target_delay += neteq_->TargetDelayMs() * 2 * kSamples;
   // We have two packets in the buffer and kAccelerate operation will
   // extract 20 ms of data.
   neteq_->GetAudio(&out_frame_, &muted, NetEq::Operation::kAccelerate);
@@ -1063,6 +1070,8 @@
   NetEqLifetimeStatistics stats = neteq_->GetLifetimeStatistics();
   EXPECT_EQ(10 * kSamples * 3, stats.jitter_buffer_delay_ms);
   EXPECT_EQ(kSamples * 3, stats.jitter_buffer_emitted_count);
+  EXPECT_EQ(expected_target_delay,
+            rtc::checked_cast<int>(stats.jitter_buffer_target_delay_ms));
 }
 
 namespace test {