| 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 |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); | 109 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); |
| 110 voe::Channel* channelPtr = ch.channel(); | 110 voe::Channel* channelPtr = ch.channel(); |
| 111 if (channelPtr == NULL) { | 111 if (channelPtr == NULL) { |
| 112 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 112 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 113 "SetMinimumPlayoutDelay() failed to locate channel"); | 113 "SetMinimumPlayoutDelay() failed to locate channel"); |
| 114 return -1; | 114 return -1; |
| 115 } | 115 } |
| 116 return channelPtr->SetMinimumPlayoutDelay(delayMs); | 116 return channelPtr->SetMinimumPlayoutDelay(delayMs); |
| 117 } | 117 } |
| 118 | 118 |
| 119 int VoEVideoSyncImpl::SetInitialPlayoutDelay(int channel, int delay_ms) { | |
| 120 WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), | |
| 121 "SetInitialPlayoutDelay(channel=%d, delay_ms=%d)", channel, | |
| 122 delay_ms); | |
| 123 | |
| 124 if (!_shared->statistics().Initialized()) { | |
| 125 _shared->SetLastError(VE_NOT_INITED, kTraceError); | |
| 126 return -1; | |
| 127 } | |
| 128 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); | |
| 129 voe::Channel* channelPtr = ch.channel(); | |
| 130 if (channelPtr == NULL) { | |
| 131 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | |
| 132 "SetInitialPlayoutDelay() failed to locate channel"); | |
| 133 return -1; | |
| 134 } | |
| 135 return channelPtr->SetInitialPlayoutDelay(delay_ms); | |
| 136 } | |
| 137 | |
| 138 int VoEVideoSyncImpl::GetDelayEstimate(int channel, | 119 int VoEVideoSyncImpl::GetDelayEstimate(int channel, |
| 139 int* jitter_buffer_delay_ms, | 120 int* jitter_buffer_delay_ms, |
| 140 int* playout_buffer_delay_ms) { | 121 int* playout_buffer_delay_ms) { |
| 141 if (!_shared->statistics().Initialized()) { | 122 if (!_shared->statistics().Initialized()) { |
| 142 _shared->SetLastError(VE_NOT_INITED, kTraceError); | 123 _shared->SetLastError(VE_NOT_INITED, kTraceError); |
| 143 return -1; | 124 return -1; |
| 144 } | 125 } |
| 145 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); | 126 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); |
| 146 voe::Channel* channelPtr = ch.channel(); | 127 voe::Channel* channelPtr = ch.channel(); |
| 147 if (channelPtr == NULL) { | 128 if (channelPtr == NULL) { |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 181 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 201 "GetLeastRequiredDelayMs() failed to locate channel"); | 182 "GetLeastRequiredDelayMs() failed to locate channel"); |
| 202 return -1; | 183 return -1; |
| 203 } | 184 } |
| 204 return channel_ptr->LeastRequiredDelayMs(); | 185 return channel_ptr->LeastRequiredDelayMs(); |
| 205 } | 186 } |
| 206 | 187 |
| 207 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API | 188 #endif // #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API |
| 208 | 189 |
| 209 } // namespace webrtc | 190 } // namespace webrtc |
| OLD | NEW |