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

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

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month 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/network_predictor_unittest.cc ('k') | webrtc/voice_engine/shared_data.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/output_mixer.h" 11 #include "webrtc/voice_engine/output_mixer.h"
12 12
13 #include "webrtc/modules/audio_processing/include/audio_processing.h" 13 #include "webrtc/modules/audio_processing/include/audio_processing.h"
14 #include "webrtc/modules/utility/interface/audio_frame_operations.h" 14 #include "webrtc/modules/utility/interface/audio_frame_operations.h"
15 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 15 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
16 #include "webrtc/system_wrappers/interface/file_wrapper.h" 16 #include "webrtc/system_wrappers/include/file_wrapper.h"
17 #include "webrtc/system_wrappers/interface/trace.h" 17 #include "webrtc/system_wrappers/include/trace.h"
18 #include "webrtc/voice_engine/include/voe_external_media.h" 18 #include "webrtc/voice_engine/include/voe_external_media.h"
19 #include "webrtc/voice_engine/statistics.h" 19 #include "webrtc/voice_engine/statistics.h"
20 #include "webrtc/voice_engine/utility.h" 20 #include "webrtc/voice_engine/utility.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 namespace voe { 23 namespace voe {
24 24
25 void 25 void
26 OutputMixer::NewMixedAudio(int32_t id, 26 OutputMixer::NewMixedAudio(int32_t id,
27 const AudioFrame& generalAudioFrame, 27 const AudioFrame& generalAudioFrame,
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 _audioFrame.data_[2 * i + 1] = 0; 595 _audioFrame.data_[2 * i + 1] = 0;
596 } 596 }
597 } 597 }
598 assert(_audioFrame.samples_per_channel_ == toneSamples); 598 assert(_audioFrame.samples_per_channel_ == toneSamples);
599 599
600 return 0; 600 return 0;
601 } 601 }
602 602
603 } // namespace voe 603 } // namespace voe
604 } // namespace webrtc 604 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/network_predictor_unittest.cc ('k') | webrtc/voice_engine/shared_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698