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

Cleanup NetEqPostponeDecodingAfterExpand field trial.

Browse Source 
Change-Id: Ie96e9b35ced4b6ca8daa78f1fa80816386a6643b
Bug: webrtc:9289
Reviewed-on: https://webrtc-review.googlesource.com/c/124127
Commit-Queue: Jakob Ivarsson‎ <jakobi@webrtc.org>
Reviewed-by: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26899}
This commit is contained in:
Jakob Ivarsson
2019-02-28 14:30:21 +01:00
committed by Commit Bot
parent 6b7bf6ab0c
commit d3a780b476
5 changed files with 31 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/audio_coding/neteq/decision_logic.cc
View File

@ -26,31 +26,8 @@
#include "system_wrappers/include/field_trial.h"
namespace {
constexpr char kPostponeDecodingFieldTrial[] =
"WebRTC-Audio-NetEqPostponeDecodingAfterExpand";
int GetPostponeDecodingLevel() {
const bool enabled =
webrtc::field_trial::IsEnabled(kPostponeDecodingFieldTrial);
if (!enabled)
return 0;
constexpr int kDefaultPostponeDecodingLevel = 50;
const std::string field_trial_string =
webrtc::field_trial::FindFullName(kPostponeDecodingFieldTrial);
int value = -1;
if (sscanf(field_trial_string.c_str(), "Enabled-%d", &value) == 1) {
if (value >= 0 && value <= 100) {
return value;
} else {
RTC_LOG(LS_WARNING)
<< "Wrong value (" << value
<< ") for postpone decoding after expand, using default ("
<< kDefaultPostponeDecodingLevel << ")";
}
}
return kDefaultPostponeDecodingLevel;
}
constexpr int kPostponeDecodingLevel = 50;
} // namespace
@ -89,8 +66,7 @@ DecisionLogic::DecisionLogic(int fs_hz,
disallow_time_stretching_(disallow_time_stretching),
timescale_countdown_(
tick_timer_->GetNewCountdown(kMinTimescaleInterval + 1)),
num_consecutive_expands_(0),
postpone_decoding_level_(GetPostponeDecodingLevel()) {
num_consecutive_expands_(0) {
delay_manager_->set_streaming_mode(false);
SetSampleRate(fs_hz, output_size_samples);
}
@ -198,9 +174,8 @@ Operations DecisionLogic::GetDecision(const SyncBuffer& sync_buffer,
expand.MuteFactor(0) < 16384 / 2 &&
cur_size_samples < static_cast<size_t>(
delay_manager_->TargetLevel() * packet_length_samples_ *
postpone_decoding_level_ / 100) >> 8 &&
kPostponeDecodingLevel / 100) >> 8 &&
!packet_buffer_.ContainsDtxOrCngPacket(decoder_database_)) {
RTC_DCHECK(webrtc::field_trial::IsEnabled(kPostponeDecodingFieldTrial));
return kExpand;
}