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

Side by Side Diff: webrtc/voice_engine/voe_video_sync_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: 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
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_video_sync_impl.h" 11 #include "webrtc/voice_engine/voe_video_sync_impl.h"
12 12
13 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
14 #include "webrtc/system_wrappers/include/trace.h" 13 #include "webrtc/system_wrappers/include/trace.h"
15 #include "webrtc/voice_engine/channel.h" 14 #include "webrtc/voice_engine/channel.h"
16 #include "webrtc/voice_engine/include/voe_errors.h" 15 #include "webrtc/voice_engine/include/voe_errors.h"
17 #include "webrtc/voice_engine/voice_engine_impl.h" 16 #include "webrtc/voice_engine/voice_engine_impl.h"
18 17
19 namespace webrtc { 18 namespace webrtc {
20 19
21 VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) { 20 VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) {
22 #ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API 21 #ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
23 return NULL; 22 return NULL;
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 180 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
182 "GetLeastRequiredDelayMs() failed to locate channel"); 181 "GetLeastRequiredDelayMs() failed to locate channel");
183 return -1; 182 return -1;
184 } 183 }
185 return channel_ptr->LeastRequiredDelayMs(); 184 return channel_ptr->LeastRequiredDelayMs();
186 } 185 }
187 186
188 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API 187 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
189 188
190 } // namespace webrtc 189 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698