1
0
mirror of https://github.com/danog/libtgvoip.git synced 2025-01-22 13:01:21 +01:00

Fix build for macOS with C++14 and later.

This commit is contained in:
John Preston 2020-01-18 18:39:43 +03:00
parent 3da1cf3b65
commit 38bc087131
3 changed files with 10 additions and 10 deletions

View File

@ -80,7 +80,7 @@ void EchoAudibility::UpdateRenderNoiseEstimator(
non_zero_render_seen_ = !IsRenderTooLow(block_buffer);
}
if (non_zero_render_seen_) {
for (int idx = render_spectrum_write_prev_.value();
for (int idx = *render_spectrum_write_prev_;
idx != render_spectrum_write_current;
idx = spectrum_buffer.DecIndex(idx)) {
render_stationarity_.UpdateNoiseEstimator(spectrum_buffer.buffer[idx]);

View File

@ -57,7 +57,7 @@ void FullBandErleEstimator::Update(rtc::ArrayView<const float> X2,
if (instantaneous_erle_.Update(Y2_sum, E2_sum)) {
hold_counter_time_domain_ = kErleHold;
erle_time_domain_log2_ +=
0.1f * ((instantaneous_erle_.GetInstErleLog2().value()) -
0.1f * ((*instantaneous_erle_.GetInstErleLog2()) -
erle_time_domain_log2_);
erle_time_domain_log2_ = rtc::SafeClamp(
erle_time_domain_log2_, min_erle_log2_, max_erle_lf_log2);
@ -130,21 +130,21 @@ void FullBandErleEstimator::ErleInstantaneous::Dump(
erle_log2_ ? *erle_log2_ : -10.f);
data_dumper->DumpRaw(
"aec3_erle_instantaneous_quality",
GetQualityEstimate() ? GetQualityEstimate().value() : 0.f);
GetQualityEstimate() ? *GetQualityEstimate() : 0.f);
data_dumper->DumpRaw("aec3_fullband_erle_max_log2", max_erle_log2_);
data_dumper->DumpRaw("aec3_fullband_erle_min_log2", min_erle_log2_);
}
void FullBandErleEstimator::ErleInstantaneous::UpdateMaxMin() {
RTC_DCHECK(erle_log2_);
if (erle_log2_.value() > max_erle_log2_) {
max_erle_log2_ = erle_log2_.value();
if (*erle_log2_ > max_erle_log2_) {
max_erle_log2_ = *erle_log2_;
} else {
max_erle_log2_ -= 0.0004; // Forget factor, approx 1dB every 3 sec.
}
if (erle_log2_.value() < min_erle_log2_) {
min_erle_log2_ = erle_log2_.value();
if (*erle_log2_ < min_erle_log2_) {
min_erle_log2_ = *erle_log2_;
} else {
min_erle_log2_ += 0.0004; // Forget factor, approx 1dB every 3 sec.
}
@ -155,7 +155,7 @@ void FullBandErleEstimator::ErleInstantaneous::UpdateQualityEstimate() {
float quality_estimate = 0.f;
RTC_DCHECK(erle_log2_);
if (max_erle_log2_ > min_erle_log2_) {
quality_estimate = (erle_log2_.value() - min_erle_log2_) /
quality_estimate = (*erle_log2_ - min_erle_log2_) /
(max_erle_log2_ - min_erle_log2_);
}
if (quality_estimate > inst_quality_estimate_) {

View File

@ -116,14 +116,14 @@ void SubbandErleEstimator::UpdateBands(rtc::ArrayView<const float> X2,
if (coming_onset_[k]) {
coming_onset_[k] = false;
erle_onsets_[k] = erle_band_update(
erle_onsets_[k], new_erle.value(), low_render_energy, 0.15f,
erle_onsets_[k], *new_erle, low_render_energy, 0.15f,
0.3f, min_erle_, max_erle);
}
hold_counters_[k] = kBlocksForOnsetDetection;
}
erle_[k] =
erle_band_update(erle_[k], new_erle.value(), low_render_energy,
erle_band_update(erle_[k], *new_erle, low_render_energy,
0.05f, 0.1f, min_erle_, max_erle);
}
}