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

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

Issue 1607353002: Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix bug in monitor_module.cc Created 4 years, 11 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_base_impl.cc ('k') | webrtc/voice_engine/voe_dtmf_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
11 #include "webrtc/voice_engine/voe_codec_impl.h" 11 #include "webrtc/voice_engine/voe_codec_impl.h"
12 12
13 #include "webrtc/base/format_macros.h" 13 #include "webrtc/base/format_macros.h"
14 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 14 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
15 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
16 #include "webrtc/system_wrappers/include/trace.h" 15 #include "webrtc/system_wrappers/include/trace.h"
17 #include "webrtc/voice_engine/channel.h" 16 #include "webrtc/voice_engine/channel.h"
18 #include "webrtc/voice_engine/include/voe_errors.h" 17 #include "webrtc/voice_engine/include/voe_errors.h"
19 #include "webrtc/voice_engine/voice_engine_impl.h" 18 #include "webrtc/voice_engine/voice_engine_impl.h"
20 19
21 namespace webrtc { 20 namespace webrtc {
22 21
23 VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) { 22 VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) {
24 #ifndef WEBRTC_VOICE_ENGINE_CODEC_API 23 #ifndef WEBRTC_VOICE_ENGINE_CODEC_API
25 return NULL; 24 return NULL;
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 return channelPtr->SetOpusDtx(enable_dtx); 376 return channelPtr->SetOpusDtx(enable_dtx);
378 } 377 }
379 378
380 RtcEventLog* VoECodecImpl::GetEventLog() { 379 RtcEventLog* VoECodecImpl::GetEventLog() {
381 return _shared->channel_manager().GetEventLog(); 380 return _shared->channel_manager().GetEventLog();
382 } 381 }
383 382
384 #endif // WEBRTC_VOICE_ENGINE_CODEC_API 383 #endif // WEBRTC_VOICE_ENGINE_CODEC_API
385 384
386 } // namespace webrtc 385 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_base_impl.cc ('k') | webrtc/voice_engine/voe_dtmf_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698