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

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

Issue 1263223002: Adding locking to webrtc::voe::Channel to fix race conditions (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Moved LeastRequiredDelayMs definition to cc file Created 5 years, 4 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/channel.cc ('k') | no next file » | 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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 _shared->SetLastError(VE_NOT_INITED, kTraceError); 211 _shared->SetLastError(VE_NOT_INITED, kTraceError);
212 return -1; 212 return -1;
213 } 213 }
214 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); 214 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
215 voe::Channel* channel_ptr = ch.channel(); 215 voe::Channel* channel_ptr = ch.channel();
216 if (channel_ptr == NULL) { 216 if (channel_ptr == NULL) {
217 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 217 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
218 "GetLeastRequiredDelayMs() failed to locate channel"); 218 "GetLeastRequiredDelayMs() failed to locate channel");
219 return -1; 219 return -1;
220 } 220 }
221 return channel_ptr->least_required_delay_ms(); 221 return channel_ptr->LeastRequiredDelayMs();
222 } 222 }
223 223
224 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API 224 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
225 225
226 } // namespace webrtc 226 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698