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

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

Issue 2408143003: Added a level controller initialization value to MediaConstraints. (Closed)
Patch Set: Rebase. Created 4 years, 2 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 | « webrtc/media/base/mediachannel.h ('k') | 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 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 865
866 if (options.level_control) { 866 if (options.level_control) {
867 level_control_ = options.level_control; 867 level_control_ = options.level_control;
868 } 868 }
869 869
870 LOG(LS_INFO) << "Level control: " 870 LOG(LS_INFO) << "Level control: "
871 << (!!level_control_ ? *level_control_ : -1); 871 << (!!level_control_ ? *level_control_ : -1);
872 webrtc::AudioProcessing::Config apm_config; 872 webrtc::AudioProcessing::Config apm_config;
873 if (level_control_) { 873 if (level_control_) {
874 apm_config.level_controller.enabled = *level_control_; 874 apm_config.level_controller.enabled = *level_control_;
875 if (options.level_control_initial_peak_level_dbfs) {
876 apm_config.level_controller.initial_peak_level_dbfs =
877 *options.level_control_initial_peak_level_dbfs;
878 }
875 } 879 }
876 880
877 // We check audioproc for the benefit of tests, since FakeWebRtcVoiceEngine 881 // We check audioproc for the benefit of tests, since FakeWebRtcVoiceEngine
878 // returns NULL on audio_processing(). 882 // returns NULL on audio_processing().
879 webrtc::AudioProcessing* audioproc = voe_wrapper_->base()->audio_processing(); 883 webrtc::AudioProcessing* audioproc = voe_wrapper_->base()->audio_processing();
880 if (audioproc) { 884 if (audioproc) {
881 audioproc->SetExtraOptions(config); 885 audioproc->SetExtraOptions(config);
882 audioproc->ApplyConfig(apm_config); 886 audioproc->ApplyConfig(apm_config);
883 } 887 }
884 888
(...skipping 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after
2647 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 2651 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
2648 const auto it = send_streams_.find(ssrc); 2652 const auto it = send_streams_.find(ssrc);
2649 if (it != send_streams_.end()) { 2653 if (it != send_streams_.end()) {
2650 return it->second->channel(); 2654 return it->second->channel();
2651 } 2655 }
2652 return -1; 2656 return -1;
2653 } 2657 }
2654 } // namespace cricket 2658 } // namespace cricket
2655 2659
2656 #endif // HAVE_WEBRTC_VOICE 2660 #endif // HAVE_WEBRTC_VOICE
OLDNEW
« no previous file with comments | « webrtc/media/base/mediachannel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698