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

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

Issue 1481493004: audio_coding: remove "main" directory (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 5 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
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | webrtc/voice_engine/voe_codec_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_base_impl.h" 11 #include "webrtc/voice_engine/voe_base_impl.h"
12 12
13 #include "webrtc/base/format_macros.h" 13 #include "webrtc/base/format_macros.h"
14 #include "webrtc/common.h" 14 #include "webrtc/common.h"
15 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h" 15 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
16 #include "webrtc/modules/audio_coding/main/include/audio_coding_module.h" 16 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
17 #include "webrtc/modules/audio_device/audio_device_impl.h" 17 #include "webrtc/modules/audio_device/audio_device_impl.h"
18 #include "webrtc/modules/audio_processing/include/audio_processing.h" 18 #include "webrtc/modules/audio_processing/include/audio_processing.h"
19 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 19 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
20 #include "webrtc/system_wrappers/include/file_wrapper.h" 20 #include "webrtc/system_wrappers/include/file_wrapper.h"
21 #include "webrtc/system_wrappers/include/logging.h" 21 #include "webrtc/system_wrappers/include/logging.h"
22 #include "webrtc/voice_engine/channel.h" 22 #include "webrtc/voice_engine/channel.h"
23 #include "webrtc/voice_engine/include/voe_errors.h" 23 #include "webrtc/voice_engine/include/voe_errors.h"
24 #include "webrtc/voice_engine/output_mixer.h" 24 #include "webrtc/voice_engine/output_mixer.h"
25 #include "webrtc/voice_engine/transmit_mixer.h" 25 #include "webrtc/voice_engine/transmit_mixer.h"
26 #include "webrtc/voice_engine/utility.h" 26 #include "webrtc/voice_engine/utility.h"
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 867 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
868 "AssociateSendChannel() failed to locate accociate_send_channel"); 868 "AssociateSendChannel() failed to locate accociate_send_channel");
869 return -1; 869 return -1;
870 } 870 }
871 871
872 channel_ptr->set_associate_send_channel(ch); 872 channel_ptr->set_associate_send_channel(ch);
873 return 0; 873 return 0;
874 } 874 }
875 875
876 } // namespace webrtc 876 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | webrtc/voice_engine/voe_codec_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698