| 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_codec_impl.h" | 11 #include "webrtc/voice_engine/voe_codec_impl.h" |
| 12 | 12 |
| 13 #include "webrtc/base/format_macros.h" | 13 #include "webrtc/base/format_macros.h" |
| 14 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" | 14 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" |
| 15 #include "webrtc/system_wrappers/include/trace.h" | 15 #include "webrtc/system_wrappers/include/trace.h" |
| 16 #include "webrtc/voice_engine/channel.h" | 16 #include "webrtc/voice_engine/channel.h" |
| 17 #include "webrtc/voice_engine/include/voe_errors.h" | 17 #include "webrtc/voice_engine/include/voe_errors.h" |
| 18 #include "webrtc/voice_engine/voice_engine_impl.h" | 18 #include "webrtc/voice_engine/voice_engine_impl.h" |
| 19 | 19 |
| 20 #ifndef WEBRTC_VOICE_ENGINE_CODEC_API | |
| 21 #error "Deprecated" | |
| 22 #endif | |
| 23 | |
| 24 namespace webrtc { | 20 namespace webrtc { |
| 25 | 21 |
| 26 VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) { | 22 VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) { |
| 27 #ifndef WEBRTC_VOICE_ENGINE_CODEC_API | |
| 28 return NULL; | |
| 29 #else | |
| 30 if (NULL == voiceEngine) { | 23 if (NULL == voiceEngine) { |
| 31 return NULL; | 24 return NULL; |
| 32 } | 25 } |
| 33 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); | 26 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); |
| 34 s->AddRef(); | 27 s->AddRef(); |
| 35 return s; | 28 return s; |
| 36 #endif | |
| 37 } | 29 } |
| 38 | 30 |
| 39 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API | |
| 40 | |
| 41 VoECodecImpl::VoECodecImpl(voe::SharedData* shared) : _shared(shared) { | 31 VoECodecImpl::VoECodecImpl(voe::SharedData* shared) : _shared(shared) { |
| 42 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), | 32 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), |
| 43 "VoECodecImpl() - ctor"); | 33 "VoECodecImpl() - ctor"); |
| 44 } | 34 } |
| 45 | 35 |
| 46 VoECodecImpl::~VoECodecImpl() { | 36 VoECodecImpl::~VoECodecImpl() { |
| 47 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), | 37 WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), |
| 48 "~VoECodecImpl() - dtor"); | 38 "~VoECodecImpl() - dtor"); |
| 49 } | 39 } |
| 50 | 40 |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); | 381 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); |
| 392 voe::Channel* channelPtr = ch.channel(); | 382 voe::Channel* channelPtr = ch.channel(); |
| 393 if (channelPtr == NULL) { | 383 if (channelPtr == NULL) { |
| 394 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, | 384 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, |
| 395 "GetOpusDtx failed to locate channel"); | 385 "GetOpusDtx failed to locate channel"); |
| 396 return -1; | 386 return -1; |
| 397 } | 387 } |
| 398 return channelPtr->GetOpusDtx(enabled); | 388 return channelPtr->GetOpusDtx(enabled); |
| 399 } | 389 } |
| 400 | 390 |
| 401 #endif // WEBRTC_VOICE_ENGINE_CODEC_API | |
| 402 | |
| 403 } // namespace webrtc | 391 } // namespace webrtc |
| OLD | NEW |