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 | |
22 namespace webrtc { | 18 namespace webrtc { |
23 | 19 |
24 VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) { | 20 VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) { |
25 #ifndef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API | |
26 return NULL; | |
27 #else | |
28 if (NULL == voiceEngine) { | 21 if (NULL == voiceEngine) { |
29 return NULL; | 22 return NULL; |
30 } | 23 } |
31 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); | 24 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); |
32 s->AddRef(); | 25 s->AddRef(); |
33 return s; | 26 return s; |
34 #endif | |
35 } | 27 } |
36 | 28 |
37 #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API | |
38 | |
39 VoEVideoSyncImpl::VoEVideoSyncImpl(voe::SharedData* shared) : _shared(shared) { | 29 VoEVideoSyncImpl::VoEVideoSyncImpl(voe::SharedData* shared) : _shared(shared) { |
40 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), | 30 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), |
41 "VoEVideoSyncImpl::VoEVideoSyncImpl() - ctor"); | 31 "VoEVideoSyncImpl::VoEVideoSyncImpl() - ctor"); |
42 } | 32 } |
43 | 33 |
44 VoEVideoSyncImpl::~VoEVideoSyncImpl() { | 34 VoEVideoSyncImpl::~VoEVideoSyncImpl() { |
45 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), | 35 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), |
46 "VoEVideoSyncImpl::~VoEVideoSyncImpl() - dtor"); | 36 "VoEVideoSyncImpl::~VoEVideoSyncImpl() - dtor"); |
47 } | 37 } |
48 | 38 |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); | 171 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); |
182 voe::Channel* channel_ptr = ch.channel(); | 172 voe::Channel* channel_ptr = ch.channel(); |
183 if (channel_ptr == NULL) { | 173 if (channel_ptr == NULL) { |
184 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 174 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
185 "GetLeastRequiredDelayMs() failed to locate channel"); | 175 "GetLeastRequiredDelayMs() failed to locate channel"); |
186 return -1; | 176 return -1; |
187 } | 177 } |
188 return channel_ptr->LeastRequiredDelayMs(); | 178 return channel_ptr->LeastRequiredDelayMs(); |
189 } | 179 } |
190 | 180 |
191 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API | |
192 | |
193 } // namespace webrtc | 181 } // namespace webrtc |
OLD | NEW |