zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change name of a NetEq internal member variable

Browse Source 
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
This commit is contained in:
henrik.lundin@webrtc.org
2014-10-08 12:10:53 +00:00
parent 742922b313
commit 5e3d7c78de
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
webrtc/modules/audio_coding/neteq/statistics_calculator.cc
View File

@ -26,7 +26,7 @@ StatisticsCalculator::StatisticsCalculator()
expanded_noise_samples_(0), expanded_noise_samples_(0),
discarded_packets_(0), discarded_packets_(0),
lost_timestamps_(0), lost_timestamps_(0),
last_report_timestamp_(0), timestamps_since_last_report_(0),
len_waiting_times_(0), len_waiting_times_(0),
next_waiting_time_index_(0) { next_waiting_time_index_(0) {
memset(waiting_times_, 0, kLenWaitingTimes * sizeof(waiting_times_[0])); memset(waiting_times_, 0, kLenWaitingTimes * sizeof(waiting_times_[0]));
@ -43,7 +43,7 @@ void StatisticsCalculator::Reset() {
void StatisticsCalculator::ResetMcu() { void StatisticsCalculator::ResetMcu() {
discarded_packets_ = 0; discarded_packets_ = 0;
lost_timestamps_ = 0; lost_timestamps_ = 0;
last_report_timestamp_ = 0; timestamps_since_last_report_ = 0;
} }
void StatisticsCalculator::ResetWaitingTimeStatistics() { void StatisticsCalculator::ResetWaitingTimeStatistics() {
@ -81,11 +81,11 @@ void StatisticsCalculator::LostSamples(int num_samples) {
} }
void StatisticsCalculator::IncreaseCounter(int num_samples, int fs_hz) { void StatisticsCalculator::IncreaseCounter(int num_samples, int fs_hz) {
last_report_timestamp_ += num_samples; timestamps_since_last_report_ += num_samples;
if (last_report_timestamp_ > if (timestamps_since_last_report_ >
static_cast<uint32_t>(fs_hz * kMaxReportPeriod)) { static_cast<uint32_t>(fs_hz * kMaxReportPeriod)) {
lost_timestamps_ = 0; lost_timestamps_ = 0;
last_report_timestamp_ = 0; timestamps_since_last_report_ = 0;
discarded_packets_ = 0; discarded_packets_ = 0;
} }
} }
@ -123,22 +123,22 @@ void StatisticsCalculator::GetNetworkStatistics(
stats->jitter_peaks_found = delay_manager.PeakFound(); stats->jitter_peaks_found = delay_manager.PeakFound();
stats->clockdrift_ppm = delay_manager.AverageIAT(); stats->clockdrift_ppm = delay_manager.AverageIAT();
stats->packet_loss_rate = CalculateQ14Ratio(lost_timestamps_, stats->packet_loss_rate =
last_report_timestamp_); CalculateQ14Ratio(lost_timestamps_, timestamps_since_last_report_);
const unsigned discarded_samples = discarded_packets_ * samples_per_packet; const unsigned discarded_samples = discarded_packets_ * samples_per_packet;
stats->packet_discard_rate = CalculateQ14Ratio(discarded_samples, stats->packet_discard_rate =
last_report_timestamp_); CalculateQ14Ratio(discarded_samples, timestamps_since_last_report_);
stats->accelerate_rate = CalculateQ14Ratio(accelerate_samples_, stats->accelerate_rate =
last_report_timestamp_); CalculateQ14Ratio(accelerate_samples_, timestamps_since_last_report_);
stats->preemptive_rate = CalculateQ14Ratio(preemptive_samples_, stats->preemptive_rate =
last_report_timestamp_); CalculateQ14Ratio(preemptive_samples_, timestamps_since_last_report_);
stats->expand_rate = CalculateQ14Ratio(expanded_voice_samples_ + stats->expand_rate =
expanded_noise_samples_, CalculateQ14Ratio(expanded_voice_samples_ + expanded_noise_samples_,
last_report_timestamp_); timestamps_since_last_report_);
// Reset counters. // Reset counters.
ResetMcu(); ResetMcu();

2
webrtc/modules/audio_coding/neteq/statistics_calculator.h
View File

@ -97,7 +97,7 @@ class StatisticsCalculator {
uint32_t expanded_noise_samples_; uint32_t expanded_noise_samples_;
int discarded_packets_; int discarded_packets_;
uint32_t lost_timestamps_; 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 waiting_times_[kLenWaitingTimes]; // Used as a circular buffer.
int len_waiting_times_; int len_waiting_times_;
int next_waiting_time_index_; int next_waiting_time_index_;