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

Side by Side Diff: webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.cc

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message 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
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/modules/audio_conference_mixer/source/audio_frame_manipulator.h " 11 #include "webrtc/modules/audio_conference_mixer/source/audio_frame_manipulator.h "
12 #include "webrtc/modules/interface/module_common_types.h" 12 #include "webrtc/modules/include/module_common_types.h"
13 #include "webrtc/typedefs.h" 13 #include "webrtc/typedefs.h"
14 14
15 namespace { 15 namespace {
16 // Linear ramping over 80 samples. 16 // Linear ramping over 80 samples.
17 // TODO(hellner): ramp using fix point? 17 // TODO(hellner): ramp using fix point?
18 const float rampArray[] = {0.0000f, 0.0127f, 0.0253f, 0.0380f, 18 const float rampArray[] = {0.0000f, 0.0127f, 0.0253f, 0.0380f,
19 0.0506f, 0.0633f, 0.0759f, 0.0886f, 19 0.0506f, 0.0633f, 0.0759f, 0.0886f,
20 0.1013f, 0.1139f, 0.1266f, 0.1392f, 20 0.1013f, 0.1139f, 0.1266f, 0.1392f,
21 0.1519f, 0.1646f, 0.1772f, 0.1899f, 21 0.1519f, 0.1646f, 0.1772f, 0.1899f,
22 0.2025f, 0.2152f, 0.2278f, 0.2405f, 22 0.2025f, 0.2152f, 0.2278f, 0.2405f,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 { 68 {
69 const size_t rampPos = rampSize - 1 - i; 69 const size_t rampPos = rampSize - 1 - i;
70 audioFrame.data_[i] = static_cast<int16_t>(rampArray[rampPos] * 70 audioFrame.data_[i] = static_cast<int16_t>(rampArray[rampPos] *
71 audioFrame.data_[i]); 71 audioFrame.data_[i]);
72 } 72 }
73 memset(&audioFrame.data_[rampSize], 0, 73 memset(&audioFrame.data_[rampSize], 0,
74 (audioFrame.samples_per_channel_ - rampSize) * 74 (audioFrame.samples_per_channel_ - rampSize) *
75 sizeof(audioFrame.data_[0])); 75 sizeof(audioFrame.data_[0]));
76 } 76 }
77 } // namespace webrtc 77 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698