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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 unified diff | Download patch
« no previous file with comments | « webrtc/voice_engine/voe_base_impl.cc ('k') | webrtc/voice_engine/voe_network_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
14 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" 13 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
14 #include "webrtc/rtc_base/format_macros.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 namespace webrtc { 20 namespace webrtc {
21 21
22 VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) { 22 VoECodec* VoECodec::GetInterface(VoiceEngine* voiceEngine) {
23 if (NULL == voiceEngine) { 23 if (NULL == voiceEngine) {
24 return NULL; 24 return NULL;
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 voe::Channel* channelPtr = ch.channel(); 382 voe::Channel* channelPtr = ch.channel();
383 if (channelPtr == NULL) { 383 if (channelPtr == NULL) {
384 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 384 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
385 "GetOpusDtx failed to locate channel"); 385 "GetOpusDtx failed to locate channel");
386 return -1; 386 return -1;
387 } 387 }
388 return channelPtr->GetOpusDtx(enabled); 388 return channelPtr->GetOpusDtx(enabled);
389 } 389 }
390 390
391 } // namespace webrtc 391 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_base_impl.cc ('k') | webrtc/voice_engine/voe_network_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698