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

Unified Diff: webrtc/voice_engine/voe_video_sync_impl.cc

Issue 2672583002: Remove VoEVideoSync interface. (Closed)
Patch Set: rebase Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/voe_video_sync_impl.h ('k') | webrtc/voice_engine/voice_engine_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voe_video_sync_impl.cc
diff --git a/webrtc/voice_engine/voe_video_sync_impl.cc b/webrtc/voice_engine/voe_video_sync_impl.cc
deleted file mode 100644
index e82cbb3b5eacd1c76890f4422e0a5dc834cecd9a..0000000000000000000000000000000000000000
--- a/webrtc/voice_engine/voe_video_sync_impl.cc
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/voice_engine/voe_video_sync_impl.h"
-
-#include "webrtc/system_wrappers/include/trace.h"
-#include "webrtc/voice_engine/channel.h"
-#include "webrtc/voice_engine/include/voe_errors.h"
-#include "webrtc/voice_engine/voice_engine_impl.h"
-
-namespace webrtc {
-
-VoEVideoSync* VoEVideoSync::GetInterface(VoiceEngine* voiceEngine) {
- if (NULL == voiceEngine) {
- return NULL;
- }
- VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
- s->AddRef();
- return s;
-}
-
-VoEVideoSyncImpl::VoEVideoSyncImpl(voe::SharedData* shared) : _shared(shared) {
- WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
- "VoEVideoSyncImpl::VoEVideoSyncImpl() - ctor");
-}
-
-VoEVideoSyncImpl::~VoEVideoSyncImpl() {
- WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
- "VoEVideoSyncImpl::~VoEVideoSyncImpl() - dtor");
-}
-
-int VoEVideoSyncImpl::GetPlayoutTimestamp(int channel,
- unsigned int& timestamp) {
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channel_ptr = ch.channel();
- if (channel_ptr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "GetPlayoutTimestamp() failed to locate channel");
- return -1;
- }
- return channel_ptr->GetPlayoutTimestamp(timestamp);
-}
-
-int VoEVideoSyncImpl::SetInitTimestamp(int channel, unsigned int timestamp) {
- WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
- "SetInitTimestamp(channel=%d, timestamp=%lu)", channel,
- timestamp);
-
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channelPtr = ch.channel();
- if (channelPtr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "SetInitTimestamp() failed to locate channel");
- return -1;
- }
- return channelPtr->SetInitTimestamp(timestamp);
-}
-
-int VoEVideoSyncImpl::SetInitSequenceNumber(int channel, short sequenceNumber) {
- WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
- "SetInitSequenceNumber(channel=%d, sequenceNumber=%hd)", channel,
- sequenceNumber);
-
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channelPtr = ch.channel();
- if (channelPtr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "SetInitSequenceNumber() failed to locate channel");
- return -1;
- }
- return channelPtr->SetInitSequenceNumber(sequenceNumber);
-}
-
-int VoEVideoSyncImpl::SetMinimumPlayoutDelay(int channel, int delayMs) {
- WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
- "SetMinimumPlayoutDelay(channel=%d, delayMs=%d)", channel,
- delayMs);
-
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channelPtr = ch.channel();
- if (channelPtr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "SetMinimumPlayoutDelay() failed to locate channel");
- return -1;
- }
- return channelPtr->SetMinimumPlayoutDelay(delayMs);
-}
-
-int VoEVideoSyncImpl::GetDelayEstimate(int channel,
- int* jitter_buffer_delay_ms,
- int* playout_buffer_delay_ms) {
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channelPtr = ch.channel();
- if (channelPtr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "GetDelayEstimate() failed to locate channel");
- return -1;
- }
- if (!channelPtr->GetDelayEstimate(jitter_buffer_delay_ms,
- playout_buffer_delay_ms)) {
- return -1;
- }
- return 0;
-}
-
-int VoEVideoSyncImpl::GetPlayoutBufferSize(int& bufferMs) {
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- AudioDeviceModule::BufferType type(AudioDeviceModule::kFixedBufferSize);
- uint16_t sizeMS(0);
- if (_shared->audio_device()->PlayoutBuffer(&type, &sizeMS) != 0) {
- _shared->SetLastError(VE_AUDIO_DEVICE_MODULE_ERROR, kTraceError,
- "GetPlayoutBufferSize() failed to read buffer size");
- return -1;
- }
- bufferMs = sizeMS;
- return 0;
-}
-
-int VoEVideoSyncImpl::GetRtpRtcp(int channel,
- RtpRtcp** rtpRtcpModule,
- RtpReceiver** rtp_receiver) {
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channelPtr = ch.channel();
- if (channelPtr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "GetPlayoutTimestamp() failed to locate channel");
- return -1;
- }
- return channelPtr->GetRtpRtcp(rtpRtcpModule, rtp_receiver);
-}
-
-int VoEVideoSyncImpl::GetLeastRequiredDelayMs(int channel) const {
- if (!_shared->statistics().Initialized()) {
- _shared->SetLastError(VE_NOT_INITED, kTraceError);
- return -1;
- }
- voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
- voe::Channel* channel_ptr = ch.channel();
- if (channel_ptr == NULL) {
- _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
- "GetLeastRequiredDelayMs() failed to locate channel");
- return -1;
- }
- return channel_ptr->LeastRequiredDelayMs();
-}
-
-} // namespace webrtc
« no previous file with comments | « webrtc/voice_engine/voe_video_sync_impl.h ('k') | webrtc/voice_engine/voice_engine_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698