OLD | NEW |
---|---|
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 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
866 new webrtc::Intelligibility(*intelligibility_enhancer_)); | 866 new webrtc::Intelligibility(*intelligibility_enhancer_)); |
867 } | 867 } |
868 | 868 |
869 if (options.level_control) { | 869 if (options.level_control) { |
870 level_control_ = options.level_control; | 870 level_control_ = options.level_control; |
871 } | 871 } |
872 | 872 |
873 LOG(LS_INFO) << "Level control: " | 873 LOG(LS_INFO) << "Level control: " |
874 << (!!level_control_ ? *level_control_ : -1); | 874 << (!!level_control_ ? *level_control_ : -1); |
875 if (level_control_) { | 875 if (level_control_) { |
876 config.Set<webrtc::LevelControl>(new webrtc::LevelControl(*level_control_)); | 876 webrtc::ApmSettings apm_settings; |
the sun
2016/08/30 10:32:38
oh, yeah! :)
peah-webrtc
2016/08/30 17:05:57
:-)
| |
877 apm_settings.level_controller.enabled = *level_control_; | |
878 voe_wrapper_->base()->audio_processing()->ApplySettings(apm_settings); | |
the sun
2016/08/30 10:32:38
Move line 883 up before this block instead.
hlundin-webrtc
2016/08/30 11:26:26
Verify the settings before applying.
peah-webrtc
2016/08/30 17:05:57
Makes sense. What I did now is that I split out ap
peah-webrtc
2016/08/30 17:05:57
Done.
| |
877 } | 879 } |
878 | 880 |
879 // We check audioproc for the benefit of tests, since FakeWebRtcVoiceEngine | 881 // We check audioproc for the benefit of tests, since FakeWebRtcVoiceEngine |
880 // returns NULL on audio_processing(). | 882 // returns NULL on audio_processing(). |
881 webrtc::AudioProcessing* audioproc = voe_wrapper_->base()->audio_processing(); | 883 webrtc::AudioProcessing* audioproc = voe_wrapper_->base()->audio_processing(); |
882 if (audioproc) { | 884 if (audioproc) { |
883 audioproc->SetExtraOptions(config); | 885 audioproc->SetExtraOptions(config); |
884 } | 886 } |
885 | 887 |
886 if (options.recording_sample_rate) { | 888 if (options.recording_sample_rate) { |
(...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2663 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 2665 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
2664 const auto it = send_streams_.find(ssrc); | 2666 const auto it = send_streams_.find(ssrc); |
2665 if (it != send_streams_.end()) { | 2667 if (it != send_streams_.end()) { |
2666 return it->second->channel(); | 2668 return it->second->channel(); |
2667 } | 2669 } |
2668 return -1; | 2670 return -1; |
2669 } | 2671 } |
2670 } // namespace cricket | 2672 } // namespace cricket |
2671 | 2673 |
2672 #endif // HAVE_WEBRTC_VOICE | 2674 #endif // HAVE_WEBRTC_VOICE |
OLD | NEW |