From 5e3d7c78de438e12984775fa27ea0da9700449b6 Mon Sep 17 00:00:00 2001
From: "henrik.lundin@webrtc.org" <henrik.lundin@webrtc.org>
Date: Wed, 8 Oct 2014 12:10:53 +0000
Subject: [PATCH] Change name of a NetEq internal member variable

In the StatisticsCalculator class, the member last_report_timestamp_
was unfortunately named. It's now been changed to
timestamps_since_last_report_, which describes it more accurately.

R=tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/25819004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7393 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../neteq/statistics_calculator.cc            | 32 +++++++++----------
 .../neteq/statistics_calculator.h             |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc
index 383f705554..097e19fabe 100644
--- a/webrtc/modules/audio_coding/neteq/statistics_calculator.cc
+++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.cc
@@ -26,7 +26,7 @@ StatisticsCalculator::StatisticsCalculator()
       expanded_noise_samples_(0),
       discarded_packets_(0),
       lost_timestamps_(0),
-      last_report_timestamp_(0),
+      timestamps_since_last_report_(0),
       len_waiting_times_(0),
       next_waiting_time_index_(0) {
   memset(waiting_times_, 0, kLenWaitingTimes * sizeof(waiting_times_[0]));
@@ -43,7 +43,7 @@ void StatisticsCalculator::Reset() {
 void StatisticsCalculator::ResetMcu() {
   discarded_packets_ = 0;
   lost_timestamps_ = 0;
-  last_report_timestamp_ = 0;
+  timestamps_since_last_report_ = 0;
 }
 
 void StatisticsCalculator::ResetWaitingTimeStatistics() {
@@ -81,11 +81,11 @@ void StatisticsCalculator::LostSamples(int num_samples) {
 }
 
 void StatisticsCalculator::IncreaseCounter(int num_samples, int fs_hz) {
-  last_report_timestamp_ += num_samples;
-  if (last_report_timestamp_ >
+  timestamps_since_last_report_ += num_samples;
+  if (timestamps_since_last_report_ >
       static_cast<uint32_t>(fs_hz * kMaxReportPeriod)) {
     lost_timestamps_ = 0;
-    last_report_timestamp_ = 0;
+    timestamps_since_last_report_ = 0;
     discarded_packets_ = 0;
   }
 }
@@ -123,22 +123,22 @@ void StatisticsCalculator::GetNetworkStatistics(
   stats->jitter_peaks_found = delay_manager.PeakFound();
   stats->clockdrift_ppm = delay_manager.AverageIAT();
 
-  stats->packet_loss_rate = CalculateQ14Ratio(lost_timestamps_,
-                                              last_report_timestamp_);
+  stats->packet_loss_rate =
+      CalculateQ14Ratio(lost_timestamps_, timestamps_since_last_report_);
 
   const unsigned discarded_samples = discarded_packets_ * samples_per_packet;
-  stats->packet_discard_rate = CalculateQ14Ratio(discarded_samples,
-                                                 last_report_timestamp_);
+  stats->packet_discard_rate =
+      CalculateQ14Ratio(discarded_samples, timestamps_since_last_report_);
 
-  stats->accelerate_rate = CalculateQ14Ratio(accelerate_samples_,
-                                             last_report_timestamp_);
+  stats->accelerate_rate =
+      CalculateQ14Ratio(accelerate_samples_, timestamps_since_last_report_);
 
-  stats->preemptive_rate = CalculateQ14Ratio(preemptive_samples_,
-                                             last_report_timestamp_);
+  stats->preemptive_rate =
+      CalculateQ14Ratio(preemptive_samples_, timestamps_since_last_report_);
 
-  stats->expand_rate = CalculateQ14Ratio(expanded_voice_samples_ +
-                                         expanded_noise_samples_,
-                                         last_report_timestamp_);
+  stats->expand_rate =
+      CalculateQ14Ratio(expanded_voice_samples_ + expanded_noise_samples_,
+                        timestamps_since_last_report_);
 
   // Reset counters.
   ResetMcu();
diff --git a/webrtc/modules/audio_coding/neteq/statistics_calculator.h b/webrtc/modules/audio_coding/neteq/statistics_calculator.h
index 07ef8536fa..95379f45a2 100644
--- a/webrtc/modules/audio_coding/neteq/statistics_calculator.h
+++ b/webrtc/modules/audio_coding/neteq/statistics_calculator.h
@@ -97,7 +97,7 @@ class StatisticsCalculator {
   uint32_t expanded_noise_samples_;
   int discarded_packets_;
   uint32_t lost_timestamps_;
-  uint32_t last_report_timestamp_;
+  uint32_t timestamps_since_last_report_;
   int waiting_times_[kLenWaitingTimes];  // Used as a circular buffer.
   int len_waiting_times_;
   int next_waiting_time_index_;