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

NetEq: Simplify the dependencies of GetNetworkStatistics

Browse Source 
Adds a new method PopulateDelayManagerStats which takes care of the
fields that needed information from the DelayManager.

Also adds a new test for StatisticsCalculator made practically
feasible by the refactoring.

Bug: webrtc:7554
Change-Id: Iff5cb5e209c276bd2784f2ccf73be8f619b1d955
Reviewed-on: https://webrtc-review.googlesource.com/3181
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Commit-Queue: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19957}
This commit is contained in:
Henrik Lundin
2017-09-25 12:30:58 +02:00
committed by Commit Bot
parent 13b668222a
commit dccfc405a6
4 changed files with 70 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
modules/audio_coding/neteq/statistics_calculator_unittest.cc
View File

@ -63,4 +63,45 @@ TEST(LifetimeStatistics, NoUpdateOnTimeStretch) {
EXPECT_EQ(200u, stats.GetLifetimeStatistics().concealed_samples);
}
TEST(StatisticsCalculator, ExpandedSamplesCorrection) {
StatisticsCalculator stats;
NetEqNetworkStatistics stats_output;
constexpr int kSampleRateHz = 48000;
constexpr int k10MsSamples = kSampleRateHz / 100;
constexpr int kPacketSizeMs = 20;
constexpr size_t kSamplesPerPacket = kPacketSizeMs * kSampleRateHz / 1000;
// Assume 2 packets in the buffer.
constexpr size_t kNumSamplesInBuffer = 2 * kSamplesPerPacket;
// Advance time by 10 ms.
stats.IncreaseCounter(k10MsSamples, kSampleRateHz);
stats.GetNetworkStatistics(kSampleRateHz, kNumSamplesInBuffer,
kSamplesPerPacket, &stats_output);
EXPECT_EQ(0u, stats_output.expand_rate);
EXPECT_EQ(0u, stats_output.speech_expand_rate);
// Correct with a negative value.
stats.ExpandedVoiceSamplesCorrection(-100);
stats.ExpandedNoiseSamplesCorrection(-100);
stats.IncreaseCounter(k10MsSamples, kSampleRateHz);
stats.GetNetworkStatistics(kSampleRateHz, kNumSamplesInBuffer,
kSamplesPerPacket, &stats_output);
// Expect no change, since negative values are disallowed.
EXPECT_EQ(0u, stats_output.expand_rate);
EXPECT_EQ(0u, stats_output.speech_expand_rate);
// Correct with a positive value.
stats.ExpandedVoiceSamplesCorrection(50);
stats.ExpandedNoiseSamplesCorrection(200);
stats.IncreaseCounter(k10MsSamples, kSampleRateHz);
stats.GetNetworkStatistics(kSampleRateHz, kNumSamplesInBuffer,
kSamplesPerPacket, &stats_output);
// Calculate expected rates in Q14. Expand rate is noise + voice, while
// speech expand rate is only voice.
EXPECT_EQ(((50u + 200u) << 14) / k10MsSamples, stats_output.expand_rate);
EXPECT_EQ((50u << 14) / k10MsSamples, stats_output.speech_expand_rate);
}
} // namespace webrtc