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

Side by Side Diff: webrtc/media/engine/webrtcvoiceengine.cc

Issue 2260173002: Disable the software noise suppressor on iOS devices (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 4 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) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 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 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 webrtc::AecmModes aecm_mode = webrtc::kAecmSpeakerphone; 608 webrtc::AecmModes aecm_mode = webrtc::kAecmSpeakerphone;
609 webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog; 609 webrtc::AgcModes agc_mode = webrtc::kAgcAdaptiveAnalog;
610 webrtc::NsModes ns_mode = webrtc::kNsHighSuppression; 610 webrtc::NsModes ns_mode = webrtc::kNsHighSuppression;
611 if (options.aecm_generate_comfort_noise) { 611 if (options.aecm_generate_comfort_noise) {
612 LOG(LS_VERBOSE) << "Comfort noise explicitly set to " 612 LOG(LS_VERBOSE) << "Comfort noise explicitly set to "
613 << *options.aecm_generate_comfort_noise 613 << *options.aecm_generate_comfort_noise
614 << " (default is false)."; 614 << " (default is false).";
615 } 615 }
616 616
617 #if defined(WEBRTC_IOS) 617 #if defined(WEBRTC_IOS)
618 // On iOS, VPIO provides built-in EC and AGC. 618 // On iOS, VPIO provides built-in EC, NS and AGC.
619 options.echo_cancellation = rtc::Optional<bool>(false); 619 options.echo_cancellation = rtc::Optional<bool>(false);
620 options.auto_gain_control = rtc::Optional<bool>(false); 620 options.auto_gain_control = rtc::Optional<bool>(false);
621 LOG(LS_INFO) << "Always disable AEC and AGC on iOS. Use built-in instead."; 621 options.noise_suppression = rtc::Optional<bool>(false);
622 LOG(LS_INFO)
623 << "Always disable AEC, NS and AGC on iOS. Use built-in instead.";
622 #elif defined(ANDROID) 624 #elif defined(ANDROID)
623 ec_mode = webrtc::kEcAecm; 625 ec_mode = webrtc::kEcAecm;
624 #endif 626 #endif
625 627
626 #if defined(WEBRTC_IOS) || defined(ANDROID) 628 #if defined(WEBRTC_IOS) || defined(ANDROID)
627 // Set the AGC mode for iOS as well despite disabling it above, to avoid 629 // Set the AGC mode for iOS as well despite disabling it above, to avoid
628 // unsupported configuration errors from webrtc. 630 // unsupported configuration errors from webrtc.
629 agc_mode = webrtc::kAgcFixedDigital; 631 agc_mode = webrtc::kAgcFixedDigital;
630 options.typing_detection = rtc::Optional<bool>(false); 632 options.typing_detection = rtc::Optional<bool>(false);
631 options.experimental_agc = rtc::Optional<bool>(false); 633 options.experimental_agc = rtc::Optional<bool>(false);
(...skipping 2036 matching lines...) Expand 10 before | Expand all | Expand 10 after
2668 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 2670 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
2669 const auto it = send_streams_.find(ssrc); 2671 const auto it = send_streams_.find(ssrc);
2670 if (it != send_streams_.end()) { 2672 if (it != send_streams_.end()) {
2671 return it->second->channel(); 2673 return it->second->channel();
2672 } 2674 }
2673 return -1; 2675 return -1;
2674 } 2676 }
2675 } // namespace cricket 2677 } // namespace cricket
2676 2678
2677 #endif // HAVE_WEBRTC_VOICE 2679 #endif // HAVE_WEBRTC_VOICE
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