OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
410 | 410 |
411 bool EchoCancellationImpl::is_aec3_enabled() const { | 411 bool EchoCancellationImpl::is_aec3_enabled() const { |
412 rtc::CritScope cs(crit_capture_); | 412 rtc::CritScope cs(crit_capture_); |
413 return aec3_enabled_; | 413 return aec3_enabled_; |
414 } | 414 } |
415 | 415 |
416 std::string EchoCancellationImpl::GetExperimentsDescription() { | 416 std::string EchoCancellationImpl::GetExperimentsDescription() { |
417 rtc::CritScope cs(crit_capture_); | 417 rtc::CritScope cs(crit_capture_); |
418 std::string description = (aec3_enabled_ ? "AEC3" : ""); | 418 std::string description = (aec3_enabled_ ? "AEC3" : ""); |
419 if (refined_adaptive_filter_enabled_) { | 419 if (refined_adaptive_filter_enabled_) { |
420 description += ";RefinedAdaptiveFilter"; | 420 if (description.size() > 0) { |
hlundin-webrtc
2016/04/19 06:49:33
Isn't it better to have a semi-colon separated lis
peah-webrtc
2016/04/19 07:55:12
Awesome variant! :-).
Done.
| |
421 description += ";"; | |
422 } | |
423 description += "RefinedAdaptiveFilter"; | |
421 } | 424 } |
422 return description; | 425 return description; |
423 } | 426 } |
424 | 427 |
425 bool EchoCancellationImpl::is_refined_adaptive_filter_enabled() const { | 428 bool EchoCancellationImpl::is_refined_adaptive_filter_enabled() const { |
426 rtc::CritScope cs(crit_capture_); | 429 rtc::CritScope cs(crit_capture_); |
427 return refined_adaptive_filter_enabled_; | 430 return refined_adaptive_filter_enabled_; |
428 } | 431 } |
429 | 432 |
430 bool EchoCancellationImpl::is_extended_filter_enabled() const { | 433 bool EchoCancellationImpl::is_extended_filter_enabled() const { |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
578 return error; | 581 return error; |
579 } | 582 } |
580 | 583 |
581 size_t EchoCancellationImpl::NumCancellersRequired() const { | 584 size_t EchoCancellationImpl::NumCancellersRequired() const { |
582 RTC_DCHECK(stream_properties_); | 585 RTC_DCHECK(stream_properties_); |
583 return stream_properties_->num_output_channels * | 586 return stream_properties_->num_output_channels * |
584 stream_properties_->num_reverse_channels; | 587 stream_properties_->num_reverse_channels; |
585 } | 588 } |
586 | 589 |
587 } // namespace webrtc | 590 } // namespace webrtc |
OLD | NEW |