Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: webrtc/modules/audio_processing/echo_cancellation_impl.cc

Issue 2292863002: Introduced new scheme for controlling the functionality inside the audio processing module (Closed)
Patch Set: Fixed bad merge Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 kMaxNumFramesToBuffer, template_queue_element, 531 kMaxNumFramesToBuffer, template_queue_element,
532 RenderQueueItemVerifier<float>(render_queue_element_max_size_))); 532 RenderQueueItemVerifier<float>(render_queue_element_max_size_)));
533 533
534 render_queue_buffer_.resize(render_queue_element_max_size_); 534 render_queue_buffer_.resize(render_queue_element_max_size_);
535 capture_queue_buffer_.resize(render_queue_element_max_size_); 535 capture_queue_buffer_.resize(render_queue_element_max_size_);
536 } else { 536 } else {
537 render_signal_queue_->Clear(); 537 render_signal_queue_->Clear();
538 } 538 }
539 } 539 }
540 540
541 void EchoCancellationImpl::SetExtraOptions(const Config& config) { 541 void EchoCancellationImpl::SetExtraOptions(const webrtc::Config& config) {
542 { 542 {
543 rtc::CritScope cs(crit_capture_); 543 rtc::CritScope cs(crit_capture_);
544 extended_filter_enabled_ = config.Get<ExtendedFilter>().enabled; 544 extended_filter_enabled_ = config.Get<ExtendedFilter>().enabled;
545 delay_agnostic_enabled_ = config.Get<DelayAgnostic>().enabled; 545 delay_agnostic_enabled_ = config.Get<DelayAgnostic>().enabled;
546 refined_adaptive_filter_enabled_ = 546 refined_adaptive_filter_enabled_ =
547 config.Get<RefinedAdaptiveFilter>().enabled; 547 config.Get<RefinedAdaptiveFilter>().enabled;
548 aec3_enabled_ = config.Get<EchoCanceller3>().enabled; 548 aec3_enabled_ = config.Get<EchoCanceller3>().enabled;
549 } 549 }
550 Configure(); 550 Configure();
551 } 551 }
(...skipping 26 matching lines...) Expand all
578 return error; 578 return error;
579 } 579 }
580 580
581 size_t EchoCancellationImpl::NumCancellersRequired() const { 581 size_t EchoCancellationImpl::NumCancellersRequired() const {
582 RTC_DCHECK(stream_properties_); 582 RTC_DCHECK(stream_properties_);
583 return stream_properties_->num_output_channels * 583 return stream_properties_->num_output_channels *
584 stream_properties_->num_reverse_channels; 584 stream_properties_->num_reverse_channels;
585 } 585 }
586 586
587 } // namespace webrtc 587 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/echo_cancellation_impl.h ('k') | webrtc/modules/audio_processing/include/audio_processing.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698