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

Side by Side Diff: webrtc/voice_engine/utility.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/transmit_mixer.cc ('k') | webrtc/voice_engine/voe_audio_processing_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/utility.h" 11 #include "webrtc/voice_engine/utility.h"
12 12
13 #include "webrtc/common_audio/resampler/include/push_resampler.h" 13 #include "webrtc/common_audio/resampler/include/push_resampler.h"
14 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h" 14 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
15 #include "webrtc/common_types.h" 15 #include "webrtc/common_types.h"
16 #include "webrtc/modules/interface/module_common_types.h" 16 #include "webrtc/modules/interface/module_common_types.h"
17 #include "webrtc/modules/utility/interface/audio_frame_operations.h" 17 #include "webrtc/modules/utility/interface/audio_frame_operations.h"
18 #include "webrtc/system_wrappers/interface/logging.h" 18 #include "webrtc/system_wrappers/include/logging.h"
19 #include "webrtc/voice_engine/voice_engine_defines.h" 19 #include "webrtc/voice_engine/voice_engine_defines.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 namespace voe { 22 namespace voe {
23 23
24 void RemixAndResample(const AudioFrame& src_frame, 24 void RemixAndResample(const AudioFrame& src_frame,
25 PushResampler<int16_t>* resampler, 25 PushResampler<int16_t>* resampler,
26 AudioFrame* dst_frame) { 26 AudioFrame* dst_frame) {
27 RemixAndResample(src_frame.data_, src_frame.samples_per_channel_, 27 RemixAndResample(src_frame.data_, src_frame.samples_per_channel_,
28 src_frame.num_channels_, src_frame.sample_rate_hz_, 28 src_frame.num_channels_, src_frame.sample_rate_hz_,
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 int32_t temp = 0; 105 int32_t temp = 0;
106 for (size_t i = 0; i < source_len; ++i) { 106 for (size_t i = 0; i < source_len; ++i) {
107 temp = source[i] + target[i]; 107 temp = source[i] + target[i];
108 target[i] = WebRtcSpl_SatW32ToW16(temp); 108 target[i] = WebRtcSpl_SatW32ToW16(temp);
109 } 109 }
110 } 110 }
111 } 111 }
112 112
113 } // namespace voe 113 } // namespace voe
114 } // namespace webrtc 114 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/transmit_mixer.cc ('k') | webrtc/voice_engine/voe_audio_processing_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698