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

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

Issue 1347353004: Reduce LS_INFO spam from voice_engine/. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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/voice_engine/voe_codec_impl.cc ('k') | webrtc/voice_engine/voe_external_media_impl.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
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 _shared->SetLastError( 143 _shared->SetLastError(
144 VE_CHANNEL_NOT_VALID, kTraceError, 144 VE_CHANNEL_NOT_VALID, kTraceError,
145 "SetSendTelephoneEventPayloadType() failed to locate channel"); 145 "SetSendTelephoneEventPayloadType() failed to locate channel");
146 return -1; 146 return -1;
147 } 147 }
148 return channelPtr->SetSendTelephoneEventPayloadType(type); 148 return channelPtr->SetSendTelephoneEventPayloadType(type);
149 } 149 }
150 150
151 int VoEDtmfImpl::GetSendTelephoneEventPayloadType(int channel, 151 int VoEDtmfImpl::GetSendTelephoneEventPayloadType(int channel,
152 unsigned char& type) { 152 unsigned char& type) {
153 WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
154 "GetSendTelephoneEventPayloadType(channel=%d)", channel);
155 if (!_shared->statistics().Initialized()) { 153 if (!_shared->statistics().Initialized()) {
156 _shared->SetLastError(VE_NOT_INITED, kTraceError); 154 _shared->SetLastError(VE_NOT_INITED, kTraceError);
157 return -1; 155 return -1;
158 } 156 }
159 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); 157 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
160 voe::Channel* channelPtr = ch.channel(); 158 voe::Channel* channelPtr = ch.channel();
161 if (channelPtr == NULL) { 159 if (channelPtr == NULL) {
162 _shared->SetLastError( 160 _shared->SetLastError(
163 VE_CHANNEL_NOT_VALID, kTraceError, 161 VE_CHANNEL_NOT_VALID, kTraceError,
164 "GetSendTelephoneEventPayloadType() failed to locate channel"); 162 "GetSendTelephoneEventPayloadType() failed to locate channel");
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 199
202 CriticalSectionScoped sc(_shared->crit_sec()); 200 CriticalSectionScoped sc(_shared->crit_sec());
203 201
204 _dtmfFeedback = enable; 202 _dtmfFeedback = enable;
205 _dtmfDirectFeedback = directFeedback; 203 _dtmfDirectFeedback = directFeedback;
206 204
207 return 0; 205 return 0;
208 } 206 }
209 207
210 int VoEDtmfImpl::GetDtmfFeedbackStatus(bool& enabled, bool& directFeedback) { 208 int VoEDtmfImpl::GetDtmfFeedbackStatus(bool& enabled, bool& directFeedback) {
211 WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
212 "GetDtmfFeedbackStatus()");
213
214 CriticalSectionScoped sc(_shared->crit_sec()); 209 CriticalSectionScoped sc(_shared->crit_sec());
215 210
216 enabled = _dtmfFeedback; 211 enabled = _dtmfFeedback;
217 directFeedback = _dtmfDirectFeedback; 212 directFeedback = _dtmfDirectFeedback;
218
219 WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_shared->instance_id(), -1),
220 "GetDtmfFeedbackStatus() => enabled=%d, directFeedback=%d",
221 enabled, directFeedback);
222 return 0; 213 return 0;
223 } 214 }
224 #endif // #ifdef WEBRTC_VOICE_ENGINE_DTMF_API 215 #endif // #ifdef WEBRTC_VOICE_ENGINE_DTMF_API
225 216
226 } // namespace webrtc 217 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_codec_impl.cc ('k') | webrtc/voice_engine/voe_external_media_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698