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

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

Issue 2883933003: Corrected the number of channels used when AEC3 is run on stereo input. (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 return formats_.render_processing_format.num_channels(); 718 return formats_.render_processing_format.num_channels();
719 } 719 }
720 720
721 size_t AudioProcessingImpl::num_input_channels() const { 721 size_t AudioProcessingImpl::num_input_channels() const {
722 // Used as callback from submodules, hence locking is not allowed. 722 // Used as callback from submodules, hence locking is not allowed.
723 return formats_.api_format.input_stream().num_channels(); 723 return formats_.api_format.input_stream().num_channels();
724 } 724 }
725 725
726 size_t AudioProcessingImpl::num_proc_channels() const { 726 size_t AudioProcessingImpl::num_proc_channels() const {
727 // Used as callback from submodules, hence locking is not allowed. 727 // Used as callback from submodules, hence locking is not allowed.
728 return capture_nonlocked_.beamformer_enabled ? 1 : num_output_channels(); 728 return (capture_nonlocked_.beamformer_enabled ||
729 capture_nonlocked_.echo_canceller3_enabled)
730 ? 1
731 : num_output_channels();
729 } 732 }
730 733
731 size_t AudioProcessingImpl::num_output_channels() const { 734 size_t AudioProcessingImpl::num_output_channels() const {
732 // Used as callback from submodules, hence locking is not allowed. 735 // Used as callback from submodules, hence locking is not allowed.
733 return formats_.api_format.output_stream().num_channels(); 736 return formats_.api_format.output_stream().num_channels();
734 } 737 }
735 738
736 void AudioProcessingImpl::set_output_will_be_muted(bool muted) { 739 void AudioProcessingImpl::set_output_will_be_muted(bool muted) {
737 rtc::CritScope cs(&crit_capture_); 740 rtc::CritScope cs(&crit_capture_);
738 capture_.output_will_be_muted = muted; 741 capture_.output_will_be_muted = muted;
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
2003 previous_agc_level(0), 2006 previous_agc_level(0),
2004 echo_path_gain_change(false) {} 2007 echo_path_gain_change(false) {}
2005 2008
2006 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default; 2009 AudioProcessingImpl::ApmCaptureState::~ApmCaptureState() = default;
2007 2010
2008 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default; 2011 AudioProcessingImpl::ApmRenderState::ApmRenderState() = default;
2009 2012
2010 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default; 2013 AudioProcessingImpl::ApmRenderState::~ApmRenderState() = default;
2011 2014
2012 } // namespace webrtc 2015 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698