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

Improve NetEq network adaptation in the beginning of the call.

Browse Source 
Change the way the forget factor converge to the steady state so that we don't overemphasize the first packets received.

The logic is controlled by the delay histogram field trial which has an added parameter to control if emphasis should be even (c=1, default) or put on later packets (c>1) until we reach our steady state forget factor.

Bug: webrtc:10411
Change-Id: Ia5d46c22d1a4a66994652f71c8cde664362bfacb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/137050
Reviewed-by: Minyue Li <minyue@webrtc.org>
Reviewed-by: Chen Xing <chxg@google.com>
Commit-Queue: Jakob Ivarsson‎ <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28039}
This commit is contained in:
Jakob Ivarsson
2019-05-22 16:54:09 +02:00
committed by Commit Bot
parent 74b373f04a
commit e9a2ee2631
6 changed files with 110 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
modules/audio_coding/neteq/delay_manager_unittest.cc
View File

@ -643,7 +643,10 @@ TEST_F(DelayManagerTest, DelayHistogramFieldTrial) {
EXPECT_EQ(DelayManager::HistogramMode::RELATIVE_ARRIVAL_DELAY,
dm_->histogram_mode());
EXPECT_EQ(1030792151, dm_->histogram_quantile()); // 0.96 in Q30.
EXPECT_EQ(32702, dm_->histogram_forget_factor()); // 0.998 in Q15.
EXPECT_EQ(
32702,
dm_->histogram()->base_forget_factor_for_testing()); // 0.998 in Q15.
EXPECT_FALSE(dm_->histogram()->start_forget_weight_for_testing());
}
{
test::ScopedFieldTrials field_trial(
@ -652,7 +655,10 @@ TEST_F(DelayManagerTest, DelayHistogramFieldTrial) {
EXPECT_EQ(DelayManager::HistogramMode::RELATIVE_ARRIVAL_DELAY,
dm_->histogram_mode());
EXPECT_EQ(1046898278, dm_->histogram_quantile()); // 0.975 in Q30.
EXPECT_EQ(32702, dm_->histogram_forget_factor()); // 0.998 in Q15.
EXPECT_EQ(
32702,
dm_->histogram()->base_forget_factor_for_testing()); // 0.998 in Q15.
EXPECT_FALSE(dm_->histogram()->start_forget_weight_for_testing());
}
{
// NetEqDelayHistogram should take precedence over
@ -664,7 +670,10 @@ TEST_F(DelayManagerTest, DelayHistogramFieldTrial) {
EXPECT_EQ(DelayManager::HistogramMode::RELATIVE_ARRIVAL_DELAY,
dm_->histogram_mode());
EXPECT_EQ(1030792151, dm_->histogram_quantile()); // 0.96 in Q30.
EXPECT_EQ(32702, dm_->histogram_forget_factor()); // 0.998 in Q15.
EXPECT_EQ(
32702,
dm_->histogram()->base_forget_factor_for_testing()); // 0.998 in Q15.
EXPECT_FALSE(dm_->histogram()->start_forget_weight_for_testing());
}
{
// Invalid parameters.
@ -675,7 +684,10 @@ TEST_F(DelayManagerTest, DelayHistogramFieldTrial) {
dm_->histogram_mode());
EXPECT_EQ(kDefaultHistogramQuantile,
dm_->histogram_quantile()); // 0.95 in Q30.
EXPECT_EQ(kForgetFactor, dm_->histogram_forget_factor()); // 0.9993 in Q15.
EXPECT_EQ(
kForgetFactor,
dm_->histogram()->base_forget_factor_for_testing()); // 0.9993 in Q15.
EXPECT_FALSE(dm_->histogram()->start_forget_weight_for_testing());
}
{
test::ScopedFieldTrials field_trial(
@ -685,7 +697,30 @@ TEST_F(DelayManagerTest, DelayHistogramFieldTrial) {
dm_->histogram_mode());
EXPECT_EQ(kDefaultHistogramQuantile,
dm_->histogram_quantile()); // 0.95 in Q30.
EXPECT_EQ(kForgetFactor, dm_->histogram_forget_factor()); // 0.9993 in Q15.
EXPECT_EQ(
kForgetFactor,
dm_->histogram()->base_forget_factor_for_testing()); // 0.9993 in Q15.
EXPECT_FALSE(dm_->histogram()->start_forget_weight_for_testing());
}
// Test parameter for new call start adaptation.
{
test::ScopedFieldTrials field_trial(
"WebRTC-Audio-NetEqDelayHistogram/Enabled-96-0.998-1/");
RecreateDelayManager();
EXPECT_EQ(dm_->histogram()->start_forget_weight_for_testing().value(), 1.0);
}
{
test::ScopedFieldTrials field_trial(
"WebRTC-Audio-NetEqDelayHistogram/Enabled-96-0.998-1.5/");
RecreateDelayManager();
EXPECT_EQ(dm_->histogram()->start_forget_weight_for_testing().value(), 1.5);
}
{
test::ScopedFieldTrials field_trial(
"WebRTC-Audio-NetEqDelayHistogram/Enabled-96-0.998-0.5/");
RecreateDelayManager();
EXPECT_FALSE(dm_->histogram()->start_forget_weight_for_testing());
}
}