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

Side by Side Diff: webrtc/voice_engine/voe_codec_impl.cc

Issue 2538093003: Prep to remove API-related #defines from voice_engine_configurations.h (Closed)
Patch Set: Created 4 years 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 unified diff | Download patch
OLDNEW
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
20 namespace webrtc { 24 namespace webrtc {
21 25
22 VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) { 26 VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) {
23 #ifndef WEBRTC_VOICE_ENGINE_CODEC_API 27 #ifndef WEBRTC_VOICE_ENGINE_CODEC_API
24 return NULL; 28 return NULL;
25 #else 29 #else
26 if (NULL == voiceEngine) { 30 if (NULL == voiceEngine) {
27 return NULL; 31 return NULL;
28 } 32 }
29 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); 33 VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 393 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
390 "GetOpusDtx failed to locate channel"); 394 "GetOpusDtx failed to locate channel");
391 return -1; 395 return -1;
392 } 396 }
393 return channelPtr->GetOpusDtx(enabled); 397 return channelPtr->GetOpusDtx(enabled);
394 } 398 }
395 399
396 #endif // WEBRTC_VOICE_ENGINE_CODEC_API 400 #endif // WEBRTC_VOICE_ENGINE_CODEC_API
397 401
398 } // namespace webrtc 402 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_audio_processing_impl.cc ('k') | webrtc/voice_engine/voe_external_media_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698