| OLD | NEW |
| 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/trace.h" | 13 #include "webrtc/system_wrappers/include/trace.h" |
| 14 #include "webrtc/voice_engine/channel.h" | 14 #include "webrtc/voice_engine/channel.h" |
| 15 #include "webrtc/voice_engine/include/voe_errors.h" | 15 #include "webrtc/voice_engine/include/voe_errors.h" |
| 16 #include "webrtc/voice_engine/voice_engine_impl.h" | 16 #include "webrtc/voice_engine/voice_engine_impl.h" |
| 17 | 17 |
| 18 #ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API |
| 19 #error "Deprecated" |
| 20 #endif |
| 21 |
| 18 namespace webrtc { | 22 namespace webrtc { |
| 19 | 23 |
| 20 VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) { | 24 VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) { |
| 21 #ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API | 25 #ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API |
| 22 return NULL; | 26 return NULL; |
| 23 #else | 27 #else |
| 24 if (NULL == voiceEngine) { | 28 if (NULL == voiceEngine) { |
| 25 return NULL; | 29 return NULL; |
| 26 } | 30 } |
| 27 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); | 31 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 184 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 181 "GetLeastRequiredDelayMs() failed to locate channel"); | 185 "GetLeastRequiredDelayMs() failed to locate channel"); |
| 182 return -1; | 186 return -1; |
| 183 } | 187 } |
| 184 return channel_ptr->LeastRequiredDelayMs(); | 188 return channel_ptr->LeastRequiredDelayMs(); |
| 185 } | 189 } |
| 186 | 190 |
| 187 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API | 191 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API |
| 188 | 192 |
| 189 } // namespace webrtc | 193 } // namespace webrtc |
| OLD | NEW |