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

Side by Side Diff: webrtc/voice_engine/channel.cc

Issue 1474363002: Use webrtc/base/logging.h for voice_engine. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: ist -> dst Created 5 years 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 | webrtc/voice_engine/transmit_mixer.cc » ('j') | 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
11 #include "webrtc/voice_engine/channel.h" 11 #include "webrtc/voice_engine/channel.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 14
15 #include "webrtc/base/checks.h" 15 #include "webrtc/base/checks.h"
16 #include "webrtc/base/format_macros.h" 16 #include "webrtc/base/format_macros.h"
17 #include "webrtc/base/logging.h"
17 #include "webrtc/base/timeutils.h" 18 #include "webrtc/base/timeutils.h"
18 #include "webrtc/common.h" 19 #include "webrtc/common.h"
19 #include "webrtc/config.h" 20 #include "webrtc/config.h"
20 #include "webrtc/modules/audio_device/include/audio_device.h" 21 #include "webrtc/modules/audio_device/include/audio_device.h"
21 #include "webrtc/modules/audio_processing/include/audio_processing.h" 22 #include "webrtc/modules/audio_processing/include/audio_processing.h"
22 #include "webrtc/modules/include/module_common_types.h" 23 #include "webrtc/modules/include/module_common_types.h"
23 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" 24 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
24 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" 25 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
25 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" 26 #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
27 #include "webrtc/modules/utility/include/audio_frame_operations.h" 28 #include "webrtc/modules/utility/include/audio_frame_operations.h"
28 #include "webrtc/modules/utility/include/process_thread.h" 29 #include "webrtc/modules/utility/include/process_thread.h"
29 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 30 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
30 #include "webrtc/system_wrappers/include/logging.h"
31 #include "webrtc/system_wrappers/include/trace.h" 31 #include "webrtc/system_wrappers/include/trace.h"
32 #include "webrtc/voice_engine/include/voe_base.h" 32 #include "webrtc/voice_engine/include/voe_base.h"
33 #include "webrtc/voice_engine/include/voe_external_media.h" 33 #include "webrtc/voice_engine/include/voe_external_media.h"
34 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 34 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
35 #include "webrtc/voice_engine/output_mixer.h" 35 #include "webrtc/voice_engine/output_mixer.h"
36 #include "webrtc/voice_engine/statistics.h" 36 #include "webrtc/voice_engine/statistics.h"
37 #include "webrtc/voice_engine/transmit_mixer.h" 37 #include "webrtc/voice_engine/transmit_mixer.h"
38 #include "webrtc/voice_engine/utility.h" 38 #include "webrtc/voice_engine/utility.h"
39 39
40 #if defined(_WIN32) 40 #if defined(_WIN32)
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
1013 VoEId(_instanceId,_channelId), 1013 VoEId(_instanceId,_channelId),
1014 "Channel::Init() failed to register RED (%d/%d) " 1014 "Channel::Init() failed to register RED (%d/%d) "
1015 "correctly", 1015 "correctly",
1016 codec.pltype, codec.plfreq); 1016 codec.pltype, codec.plfreq);
1017 } 1017 }
1018 } 1018 }
1019 #endif 1019 #endif
1020 } 1020 }
1021 1021
1022 if (rx_audioproc_->noise_suppression()->set_level(kDefaultNsMode) != 0) { 1022 if (rx_audioproc_->noise_suppression()->set_level(kDefaultNsMode) != 0) {
1023 LOG_FERR1(LS_ERROR, noise_suppression()->set_level, kDefaultNsMode); 1023 LOG(LS_ERROR) << "noise_suppression()->set_level(kDefaultNsMode) failed.";
1024 return -1; 1024 return -1;
1025 } 1025 }
1026 if (rx_audioproc_->gain_control()->set_mode(kDefaultRxAgcMode) != 0) { 1026 if (rx_audioproc_->gain_control()->set_mode(kDefaultRxAgcMode) != 0) {
1027 LOG_FERR1(LS_ERROR, gain_control()->set_mode, kDefaultRxAgcMode); 1027 LOG(LS_ERROR) << "gain_control()->set_mode(kDefaultRxAgcMode) failed.";
1028 return -1; 1028 return -1;
1029 } 1029 }
1030 1030
1031 return 0; 1031 return 0;
1032 } 1032 }
1033 1033
1034 int32_t 1034 int32_t
1035 Channel::SetEngineInformation(Statistics& engineStatistics, 1035 Channel::SetEngineInformation(Statistics& engineStatistics,
1036 OutputMixer& outputMixer, 1036 OutputMixer& outputMixer,
1037 voe::TransmitMixer& transmitMixer, 1037 voe::TransmitMixer& transmitMixer,
(...skipping 2897 matching lines...) Expand 10 before | Expand all | Expand 10 after
3935 int64_t min_rtt = 0; 3935 int64_t min_rtt = 0;
3936 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) 3936 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt)
3937 != 0) { 3937 != 0) {
3938 return 0; 3938 return 0;
3939 } 3939 }
3940 return rtt; 3940 return rtt;
3941 } 3941 }
3942 3942
3943 } // namespace voe 3943 } // namespace voe
3944 } // namespace webrtc 3944 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/voice_engine/transmit_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698